From: Arik Nemtsov <arik@wizery.com>
To: <linux-wireless@vger.kernel.org>
Cc: Luciano Coelho <coelho@ti.com>, Arik Nemtsov <arik@wizery.com>
Subject: [PATCH v2 4/8] wl12xx: report invalid TX rate when returning non-TX-ed skbs
Date: Wed, 23 Feb 2011 00:22:27 +0200 [thread overview]
Message-ID: <1298413351-15462-5-git-send-email-arik@wizery.com> (raw)
In-Reply-To: <1298413351-15462-1-git-send-email-arik@wizery.com>
Report a TX rate idx of -1 and count 0 when returning untransmitted
skbs to mac80211 using ieee80211_tx_status(). Otherwise mac80211
tries to use the returned (essentially garbage) status.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
drivers/net/wireless/wl12xx/tx.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index 0c96255..e67b68b 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -606,10 +606,14 @@ void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid)
struct sk_buff *skb;
int i, total = 0;
unsigned long flags;
+ struct ieee80211_tx_info *info;
for (i = 0; i < NUM_TX_QUEUES; i++) {
while ((skb = skb_dequeue(&wl->links[hlid].tx_queue[i]))) {
wl1271_debug(DEBUG_TX, "link freeing skb 0x%p", skb);
+ info = IEEE80211_SKB_CB(skb);
+ info->status.rates[0].idx = -1;
+ info->status.rates[0].count = 0;
ieee80211_tx_status(wl->hw, skb);
total++;
}
@@ -627,6 +631,7 @@ void wl1271_tx_reset(struct wl1271 *wl)
{
int i;
struct sk_buff *skb;
+ struct ieee80211_tx_info *info;
/* TX failure */
if (wl->bss_type == BSS_TYPE_AP_BSS) {
@@ -639,6 +644,9 @@ void wl1271_tx_reset(struct wl1271 *wl)
while ((skb = skb_dequeue(&wl->tx_queue[i]))) {
wl1271_debug(DEBUG_TX, "freeing skb 0x%p",
skb);
+ info = IEEE80211_SKB_CB(skb);
+ info->status.rates[0].idx = -1;
+ info->status.rates[0].count = 0;
ieee80211_tx_status(wl->hw, skb);
}
}
@@ -657,6 +665,9 @@ void wl1271_tx_reset(struct wl1271 *wl)
skb = wl->tx_frames[i];
wl1271_free_tx_id(wl, i);
wl1271_debug(DEBUG_TX, "freeing skb 0x%p", skb);
+ info = IEEE80211_SKB_CB(skb);
+ info->status.rates[0].idx = -1;
+ info->status.rates[0].count = 0;
ieee80211_tx_status(wl->hw, skb);
}
}
--
1.7.1
next prev parent reply other threads:[~2011-02-22 22:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-22 22:22 [PATCH v2 0/8] wl12xx: AP-mode per link PSM Arik Nemtsov
2011-02-22 22:22 ` [PATCH v2 1/8] wl12xx: fix potential race condition with TX queue watermark Arik Nemtsov
2011-02-22 22:22 ` [PATCH v2 2/8] wl12xx: AP-mode - fix race condition on sta connection Arik Nemtsov
2011-02-22 22:22 ` [PATCH v2 3/8] wl12xx: AP-mode - TX queue per link in AC Arik Nemtsov
2011-02-22 22:22 ` Arik Nemtsov [this message]
2011-02-22 22:22 ` [PATCH v2 5/8] wl12xx: AP-mode - support HW based link PS monitoring Arik Nemtsov
2011-02-22 22:22 ` [PATCH v2 6/8] wl12xx: AP mode - fix bug in cleanup of wl1271_op_sta_add() Arik Nemtsov
2011-02-22 22:22 ` [PATCH v2 7/8] wl12xx: AP-mode - count free FW TX blocks per link Arik Nemtsov
2011-02-22 22:22 ` [PATCH v2 8/8] wl12xx: AP-mode - management of links in PS-mode Arik Nemtsov
2011-02-23 13:55 ` [PATCH v2 0/8] wl12xx: AP-mode per link PSM Luciano Coelho
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=1298413351-15462-5-git-send-email-arik@wizery.com \
--to=arik@wizery.com \
--cc=coelho@ti.com \
--cc=linux-wireless@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