CINXE.COM

<?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: Zhu Yi: [PATCH] ipw2200: Fix NETDEV_TX_BUSY erroneous returned</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 Zhu Yi" href="/groupie.php?aid=21712" /><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/2006"> [2006]</a> 聽 <a class="nb" href="/lkml/2006/1"> [Jan]</a> 聽 <a class="nb" href="/lkml/2006/1/3"> [3]</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/2006/1/3/548" onclick="this.href='/lkml/headers'+'/2006/1/3/548';">[headers]</a>聽 <a href="/lkml/bounce/2006/1/3/548">[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/2006/1/3/548">First message in thread</a></li><li class="origin"><a href="/lkml/2006/1/4/217">Zhu Yi</a><ul><li><a href="/lkml/2006/1/4/217">Stephen Hemminger</a></li><li><a href="/lkml/2006/1/4/428">Francois Romieu</a></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2006/1/3/548/1">Get diff 1</a></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, 4 Jan 2006 12:09:54 +0800</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Zhu Yi <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">[PATCH] ipw2200: Fix NETDEV_TX_BUSY erroneous returned</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody"><br />This patch fixes the warning below warning for the ipw2200 driver.<br /><br /> NETDEV_TX_BUSY returned; driver should report queue full via<br /> ieee_device->is_queue_full.<br /><br />Signed-off-by: Hong Liu <hong.liu@intel.com><br />Signed-off-by: Zhu Yi <yi.zhu@intel.com><br />--<br /><br />diff -urp linux.orig/drivers/net/wireless/ipw2200.c linux/drivers/net/wireless/ipw2200.c<br />--- linux.orig/drivers/net/wireless/ipw2200.c 2005-10-21 05:35:24.000000000 +0800<br />+++ linux/drivers/net/wireless/ipw2200.c 2005-10-25 13:22:38.000000000<br />+0800<br />@@ -9649,11 +9649,6 @@ static inline int ipw_tx_skb(struct ipw_<br /> u16 remaining_bytes;<br /> int fc;<br /> <br />- /* If there isn't room in the queue, we return busy and let the<br />- * network stack requeue the packet for us */<br />- if (ipw_queue_space(q) < q->high_mark)<br />- return NETDEV_TX_BUSY;<br />-<br /> switch (priv->ieee->iw_mode) {<br /> case IW_MODE_ADHOC:<br /> hdr_len = IEEE80211_3ADDR_LEN;<br />@@ -9871,7 +9866,7 @@ static int ipw_net_hard_start_xmit(struc<br /> <br /> fail_unlock:<br /> spin_unlock_irqrestore(&priv->lock, flags);<br />- return 1;<br />+ return -1;<br /> }<br /> <br /> static struct net_device_stats *ipw_net_get_stats(struct net_device *dev)<br />-<br />To unsubscribe from this list: send the line "unsubscribe linux-kernel" in<br />the body of a message to majordomo@vger.kernel.org<br />More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a><br />Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a><br /></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: 2006-01-04 05:17 聽聽 [from the cache]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></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>