aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/p54pci.c
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@web.de>2008-12-09 21:09:00 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-12-12 14:01:55 -0500
commit39ca5bb76f3382b1cb0062d75ec45abd1c46e6d2 (patch)
tree21dd8eaf22674e4f6a6c026eee6977e87bf938d4 /drivers/net/wireless/p54/p54pci.c
parent30dab79ed40f6c0f8a24e25fd9be7bd873eeeb8b (diff)
downloadkernel_samsung_smdk4412-39ca5bb76f3382b1cb0062d75ec45abd1c46e6d2.zip
kernel_samsung_smdk4412-39ca5bb76f3382b1cb0062d75ec45abd1c46e6d2.tar.gz
kernel_samsung_smdk4412-39ca5bb76f3382b1cb0062d75ec45abd1c46e6d2.tar.bz2
p54: enforce strict tx_queue limits
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> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54pci.c')
-rw-r--r--drivers/net/wireless/p54/p54pci.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index d21c509..c28220e 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -332,13 +332,6 @@ static void p54p_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
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)