From: Christian Lamparter <chunkeey@web.de>
To: linux-wireless@vger.kernel.org
Cc: "John W. Linville" <linville@tuxdriver.com>
Subject: [PATCH 2/2] p54: enforce strict tx_queue limits
Date: Tue, 9 Dec 2008 21:09:00 +0100 [thread overview]
Message-ID: <200812092109.00988.chunkeey@web.de> (raw)
The patch fixes an old FIXME in p54pci.c by moving the "queue full"
check into the common library, where we can deal with it properly.
Signed-off-by: Christian Lamparter <chunkeey@web.de>
---
diff -Nurp a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
--- a/drivers/net/wireless/p54/p54common.c 2008-12-09 20:13:56.467888032 +0100
+++ b/drivers/net/wireless/p54/p54common.c 2008-12-09 20:49:21.235888230 +0100
@@ -889,7 +889,27 @@ static int p54_assign_address(struct iee
return -EINVAL;
spin_lock_irqsave(&priv->tx_queue.lock, flags);
+
left = skb_queue_len(&priv->tx_queue);
+ if (unlikely(left >= 28)) {
+ /*
+ * The tx_queue is nearly full!
+ * We have throttle normal data traffic, because we must
+ * have a few spare slots for control frames left.
+ */
+ ieee80211_stop_queues(dev);
+
+ if (unlikely(left == 32)) {
+ /*
+ * The tx_queue is now really full.
+ *
+ * TODO: check if the device has crashed and reset it.
+ */
+ spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
+ return -ENOSPC;
+ }
+ }
+
while (left--) {
u32 hole_size;
info = IEEE80211_SKB_CB(entry);
@@ -918,7 +938,7 @@ static int p54_assign_address(struct iee
if (!target_skb) {
spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
ieee80211_stop_queues(dev);
- return -ENOMEM;
+ return -ENOSPC;
}
info = IEEE80211_SKB_CB(skb);
diff -Nurp a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
--- a/drivers/net/wireless/p54/p54pci.c 2008-12-09 20:05:21.251888445 +0100
+++ b/drivers/net/wireless/p54/p54pci.c 2008-12-07 22:04:45.952897552 +0100
@@ -332,13 +332,6 @@ static void p54p_tx(struct ieee80211_hw
P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
P54P_READ(dev_int);
-
- /* FIXME: unlikely to happen because the device usually runs out of
- memory before we fill the ring up, but we can make it impossible */
- if (idx - device_idx > ARRAY_SIZE(ring_control->tx_data) - 2) {
- p54_free_skb(dev, skb);
- printk(KERN_INFO "%s: tx overflow.\n", wiphy_name(dev->wiphy));
- }
}
static void p54p_stop(struct ieee80211_hw *dev)
next reply other threads:[~2008-12-09 20:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-09 20:09 Christian Lamparter [this message]
2008-12-10 2:39 ` [PATCH 2/2] p54: enforce strict tx_queue limits Larry Finger
2008-12-10 11:54 ` Christian Lamparter
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=200812092109.00988.chunkeey@web.de \
--to=chunkeey@web.de \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.