diff options
author | Jouni Malinen <jouni.malinen@atheros.com> | 2008-08-11 07:01:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-29 16:24:03 -0400 |
commit | 147583c057c43095925b5f331fe304f2d5b997ba (patch) | |
tree | a7fc21673b4090ce371e5fd130b934131ab3b0f0 /drivers/net/wireless/ath9k/main.c | |
parent | 580f0b8a6dc1cb4d32c351a507d1c1d319bdc1eb (diff) |
ath9k: Assign seq# when mac80211 requests this
Use TX control flag IEEE80211_TX_CTL_ASSIGN_SEQ as a request to update
the seq# for the frames. This will likely require some further cleanup
to get seq# correctly for Beacons vs. other frames and also potentially
for multiple BSSes. Anyway, this is better than ending up sending out
most frames with seq# 0.
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath9k/main.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 4b61666261e3..8fbde897406e 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
@@ -368,6 +368,20 @@ static int ath9k_tx(struct ieee80211_hw *hw, | |||
368 | { | 368 | { |
369 | struct ath_softc *sc = hw->priv; | 369 | struct ath_softc *sc = hw->priv; |
370 | int hdrlen, padsize; | 370 | int hdrlen, padsize; |
371 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | ||
372 | |||
373 | /* | ||
374 | * As a temporary workaround, assign seq# here; this will likely need | ||
375 | * to be cleaned up to work better with Beacon transmission and virtual | ||
376 | * BSSes. | ||
377 | */ | ||
378 | if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { | ||
379 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | ||
380 | if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT) | ||
381 | sc->seq_no += 0x10; | ||
382 | hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); | ||
383 | hdr->seq_ctrl |= cpu_to_le16(sc->seq_no); | ||
384 | } | ||
371 | 385 | ||
372 | /* Add the padding after the header if this is not already done */ | 386 | /* Add the padding after the header if this is not already done */ |
373 | hdrlen = ieee80211_get_hdrlen_from_skb(skb); | 387 | hdrlen = ieee80211_get_hdrlen_from_skb(skb); |