LKML: Jeff Garzik: Re: [PATCH] USB: usbnet uses netif_msg

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Jeff Garzik: Re: [PATCH] USB: usbnet uses netif_msg_*() ethtool filtering</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Jeff Garzik" href="/groupie.php?aid=46" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/3"> [Mar]</a> 聽 <a class="nb" href="/lkml/2005/3/30"> [30]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/3/30/280" onclick="this.href='/lkml/headers'+'/2005/3/30/280';">[headers]</a>聽 <a href="/lkml/bounce/2005/3/30/280">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/3/30/280">First message in thread</a></li><li class="origin"><a href="/lkml/2005/3/30/286">Jeff Garzik</a><ul><li><a href="/lkml/2005/3/30/286">David Brownell</a><ul><li><a href="/lkml/2005/3/30/290">Jeff Garzik</a><ul><li><a href="/lkml/2005/3/30/307">David Brownell</a></li></ul></li></ul></li></ul></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Wed, 30 Mar 2005 19:30:59 -0500</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Jeff Garzik <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">Re: [PATCH] USB: usbnet uses netif_msg_*() ethtool filtering</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">Linux Kernel Mailing List wrote: > ChangeSet 1.2181.4.72, 2005/03/24 15:31:29-08:00, david-b@pacbell.net > > [PATCH] USB: usbnet uses netif_msg_*() ethtool filtering > > This converts most of the usbnet code to actually use the ethtool > message flags. The ASIX code is left untouched, since there are > a bunch of patches pending there ... that's where the remaining > handful of "sparse -Wbitwise" warnings come from. > > Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> It would be nice if people at least CC'd me on net driver patches. > @@ -2886,18 +2885,21 @@ > defer_kevent (dev, EVENT_RX_MEMORY); > break; > case -ENODEV: > - devdbg (dev, "device gone"); > + if (netif_msg_ifdown (dev)) > + devdbg (dev, "device gone"); > netif_device_detach (dev->net); > break; > default: > - devdbg (dev, "rx submit, %d", retval); > + if (netif_msg_rx_err (dev)) > + devdbg (dev, "rx submit, %d", retval); > tasklet_schedule (&dev->bh); > break; > case 0: > __skb_queue_tail (&dev->rxq, skb); > } > } else { > - devdbg (dev, "rx: stopped"); > + if (netif_msg_ifdown (dev)) > + devdbg (dev, "rx: stopped"); > retval = -ENOLINK; > } > spin_unlock_irqrestore (&dev->rxq.lock, lockflags); netfi_msg_ifdown() is only for __interface__ up/down events; as such, there should be only one message of this type in dev->open(), and one message of this type in dev->stop(). > @@ -2963,9 +2967,8 @@ > // software-driven interface shutdown > case -ECONNRESET: // async unlink > case -ESHUTDOWN: // hardware gone > -#ifdef VERBOSE > - devdbg (dev, "rx shutdown, code %d", urb_status); > -#endif > + if (netif_msg_ifdown (dev)) > + devdbg (dev, "rx shutdown, code %d", urb_status); > goto block; > > // we get controller i/o faults during khubd disconnect() delays. ditto > @@ -3026,9 +3030,8 @@ > /* software-driven interface shutdown */ > case -ENOENT: // urb killed > case -ESHUTDOWN: // hardware gone > -#ifdef VERBOSE > - devdbg (dev, "intr shutdown, code %d", status); > -#endif > + if (netif_msg_ifdown (dev)) > + devdbg (dev, "intr shutdown, code %d", status); > return; > > /* NOTE: not throttling like RX/TX, since this endpoint ditto > @@ -3044,7 +3047,7 @@ > > memset(urb->transfer_buffer, 0, urb->transfer_buffer_length); > status = usb_submit_urb (urb, GFP_ATOMIC); > - if (status != 0) > + if (status != 0 && netif_msg_timer (dev)) > deverr(dev, "intr resubmit --> %d", status); > } > this looks more like a debugging message? > @@ -3094,7 +3097,7 @@ > > netif_stop_queue (net); > > - if (dev->msg_level >= 2) > + if (netif_msg_ifdown (dev)) > devinfo (dev, "stop stats: rx/tx %ld/%ld, errs %ld/%ld", > dev->stats.rx_packets, dev->stats.tx_packets, > dev->stats.rx_errors, dev->stats.tx_errors see -- this one is actually OK > @@ -3110,7 +3113,8 @@ > && skb_queue_len (&dev->txq) > && skb_queue_len (&dev->done)) { > msleep(UNLINK_TIMEOUT_MS); > - devdbg (dev, "waited for %d urb completions", temp); > + if (netif_msg_ifdown (dev)) > + devdbg (dev, "waited for %d urb completions", temp); > } > dev->wait = NULL; > remove_wait_queue (&unlink_wakeup, &wait); not OK > @@ -3142,16 +3146,19 @@ > > // put into "known safe" state > if (info->reset && (retval = info->reset (dev)) < 0) { > - devinfo (dev, "open reset fail (%d) usbnet usb-%s-%s, %s", > - retval, > - dev->udev->bus->bus_name, dev->udev->devpath, > + if (netif_msg_ifup (dev)) > + devinfo (dev, > + "open reset fail (%d) usbnet usb-%s-%s, %s", > + retval, > + dev->udev->bus->bus_name, dev->udev->devpath, > info->description); > goto done; > } > > // insist peer be connected > if (info->check_connect && (retval = info->check_connect (dev)) < 0) { > - devdbg (dev, "can't open; %d", retval); > + if (netif_msg_ifup (dev)) > + devdbg (dev, "can't open; %d", retval); > goto done; > } > not OK > @@ -3159,13 +3166,14 @@ > if (dev->interrupt) { > retval = usb_submit_urb (dev->interrupt, GFP_KERNEL); > if (retval < 0) { > - deverr (dev, "intr submit %d", retval); > + if (netif_msg_ifup (dev)) > + deverr (dev, "intr submit %d", retval); > goto done; > } > } > > netif_start_queue (net); > - if (dev->msg_level >= 2) { > + if (netif_msg_ifup (dev)) { > char *framing; > > if (dev->driver_info->flags & FLAG_FRAMING_NC) not OK > @@ -3526,7 +3541,7 @@ > if (urb != NULL) > rx_submit (dev, urb, GFP_ATOMIC); > } > - if (temp != dev->rxq.qlen) > + if (temp != dev->rxq.qlen && netif_msg_link (dev)) > devdbg (dev, "rxqlen %d --> %d", > temp, dev->rxq.qlen); > if (dev->rxq.qlen < qlen) highly questionable. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a> Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a> </pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-04-06 13:31 聽聽 [from the cache] 漏2003-2020 <a href="http://blog.jasper.es/">Jasper Spaans</a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>

CINXE.COM

LKML: Jeff Garzik: Re: [PATCH] USB: usbnet uses netif_msg_*() ethtool filtering