p54: fix stalling in TX queue This patch makes the p54 TX queue not stall anymore. Probably not the most efficient thing to do, but it's better than stalling.
It also adds a small comment to prism54common.h about the origin of the pda
definitions and inserts a missing verb in the comment for p54_assign_address.
Signed-off-by: Michael Wu <[EMAIL PROTECTED]>
---
drivers/net/wireless/d80211/p54/prism54common.c | 10 +++++-----
drivers/net/wireless/d80211/p54/prism54common.h | 2 ++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/d80211/p54/prism54common.c
b/drivers/net/wireless/d80211/p54/prism54common.c
index 34bccee..6f4cb5f 100644
--- a/drivers/net/wireless/d80211/p54/prism54common.c
+++ b/drivers/net/wireless/d80211/p54/prism54common.c
@@ -261,8 +261,8 @@ static void p54_rx_frame_sent(struct net
entry = entry->next;
}
- if (freed < IEEE80211_MAX_RTS_THRESHOLD + 0x170 + sizeof(struct
p54_control_hdr))
- ieee80211_wake_queue(dev, 0);
+ if (skb_queue_empty(&priv->tx_queue))
+ ieee80211_wake_queue(dev, 0);
}
static void p54_rx_control(struct net_device *dev, struct sk_buff *skb)
@@ -308,9 +308,9 @@ EXPORT_SYMBOL_GPL(p54_rx);
/*
* So, the firmware is somewhat stupid and doesn't know what places in its
* memory incoming data should go to. By poking around in the firmware, we
- * can some unused memory to upload our packets to. However, data that we
want
- * the card to TX needs to stay intact until the card has told us that it is
- * done with it. This function finds empty places we can upload to and
+ * can find some unused memory to upload our packets to. However, data that
we
+ * want the card to TX needs to stay intact until the card has told us that
+ * it is done with it. This function finds empty places we can upload to and
* marks allocated areas as reserved if necessary. p54_rx_frame_sent frees
* allocated areas.
*/
diff --git a/drivers/net/wireless/d80211/p54/prism54common.h
b/drivers/net/wireless/d80211/p54/prism54common.h
index e2c1ff4..15199f6 100644
--- a/drivers/net/wireless/d80211/p54/prism54common.h
+++ b/drivers/net/wireless/d80211/p54/prism54common.h
@@ -43,6 +43,8 @@ #define FW_LM86 0x4c4d3836
#define FW_LM87 0x4c4d3837
#define FW_LM20 0x4c4d3230
+/* PDA defines are Copyright (C) 2005 Nokia Corporation (taken from
islsm_pda.h) */
+
struct pda_entry {
u16 len; /* includes both code and data */
u16 code;
pgp4akAjeabep.pgp
Description: PGP signature
