From: Zhu Yi <yi.zhu@intel.com>
To: Andrew Morton <akpm@osdl.org>
Cc: jketreno@linux.intel.com, jgarzik@pobox.com,
linux-kernel@vger.kernel.org
Subject: [PATCH] ipw2200: Fix NETDEV_TX_BUSY erroneous returned
Date: Wed, 4 Jan 2006 12:09:54 +0800 [thread overview]
Message-ID: <20060104040954.GA19618@mail.intel.com> (raw)
This patch fixes the warning below warning for the ipw2200 driver.
NETDEV_TX_BUSY returned; driver should report queue full via
ieee_device->is_queue_full.
Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
--
diff -urp linux.orig/drivers/net/wireless/ipw2200.c linux/drivers/net/wireless/ipw2200.c
--- linux.orig/drivers/net/wireless/ipw2200.c 2005-10-21 05:35:24.000000000 +0800
+++ linux/drivers/net/wireless/ipw2200.c 2005-10-25 13:22:38.000000000
+0800
@@ -9649,11 +9649,6 @@ static inline int ipw_tx_skb(struct ipw_
u16 remaining_bytes;
int fc;
- /* If there isn't room in the queue, we return busy and let the
- * network stack requeue the packet for us */
- if (ipw_queue_space(q) < q->high_mark)
- return NETDEV_TX_BUSY;
-
switch (priv->ieee->iw_mode) {
case IW_MODE_ADHOC:
hdr_len = IEEE80211_3ADDR_LEN;
@@ -9871,7 +9866,7 @@ static int ipw_net_hard_start_xmit(struc
fail_unlock:
spin_unlock_irqrestore(&priv->lock, flags);
- return 1;
+ return -1;
}
static struct net_device_stats *ipw_net_get_stats(struct net_device *dev)
next reply other threads:[~2006-01-04 4:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-04 4:09 Zhu Yi [this message]
2006-01-04 17:58 ` [PATCH] ipw2200: Fix NETDEV_TX_BUSY erroneous returned Stephen Hemminger
2006-01-04 23:52 ` Francois Romieu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060104040954.GA19618@mail.intel.com \
--to=yi.zhu@intel.com \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=jketreno@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox