From: Changli Gao <xiaosuo@gmail.com>
To: Jamal Hadi Salim <hadi@cyberus.ca>
Cc: "David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, Changli Gao <xiaosuo@gmail.com>
Subject: [PATCH 3/5] ifb: fix tx_queue_len overlimit
Date: Mon, 13 Dec 2010 22:43:32 +0800 [thread overview]
Message-ID: <1292251414-5154-3-git-send-email-xiaosuo@gmail.com> (raw)
In-Reply-To: <1292251414-5154-1-git-send-email-xiaosuo@gmail.com>
We should check the length of rq after enqueuing, otherwise the length
of rq will be over tx_queue_len.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
---
drivers/net/ifb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 1628d01..57c5cfb 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -131,15 +131,15 @@ static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK;
}
- if (skb_queue_len(&dp->rq) >= dev->tx_queue_len)
- netif_stop_queue(dev);
-
__skb_queue_tail(&dp->rq, skb);
if (!dp->tasklet_pending) {
dp->tasklet_pending = 1;
tasklet_schedule(&dp->ifb_tasklet);
}
+ if (skb_queue_len(&dp->rq) >= dev->tx_queue_len)
+ netif_stop_queue(dev);
+
return NETDEV_TX_OK;
}
next prev parent reply other threads:[~2010-12-13 14:44 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-13 14:43 [PATCH 1/5] ifb: remove function declarations Changli Gao
2010-12-13 14:43 ` [PATCH 2/5] ifb: code cleanup Changli Gao
2010-12-15 12:32 ` jamal
2010-12-13 14:43 ` Changli Gao [this message]
2010-12-15 12:33 ` [PATCH 3/5] ifb: fix tx_queue_len overlimit jamal
2010-12-15 12:36 ` Changli Gao
2010-12-15 12:42 ` jamal
2010-12-13 14:43 ` [PATCH 4/5] ifb: add multiqueue support Changli Gao
2010-12-13 16:26 ` Eric Dumazet
2010-12-13 23:42 ` Changli Gao
2010-12-13 17:05 ` Eric Dumazet
2010-12-13 23:46 ` Changli Gao
2010-12-15 12:34 ` jamal
2010-12-13 14:43 ` [PATCH 5/5] net: add skb.old_queue_mapping Changli Gao
2010-12-13 16:56 ` Eric Dumazet
2010-12-13 17:58 ` David Miller
2010-12-13 23:58 ` Changli Gao
2010-12-15 2:59 ` Changli Gao
2010-12-15 12:40 ` jamal
2010-12-15 12:52 ` Changli Gao
2010-12-15 12:31 ` [PATCH 1/5] ifb: remove function declarations jamal
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=1292251414-5154-3-git-send-email-xiaosuo@gmail.com \
--to=xiaosuo@gmail.com \
--cc=davem@davemloft.net \
--cc=hadi@cyberus.ca \
--cc=netdev@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;
as well as URLs for NNTP newsgroup(s).