aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorSujith Manoharan <Sujith.Manoharan@atheros.com>2011-02-20 21:18:53 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-02-23 16:25:26 -0500
commit9a3d025be11a1da625f8a71636b55a3bd3718574 (patch)
tree6bc3d0b21b49d40af7cfddd9480c69ae626819c3 /drivers/net/wireless/ath
parent585895cdfc683a067d803fead83267cee309ffd0 (diff)
ath9k_htc: Make sequence number calculation per-VIF
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath9k/htc.h2
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_drv_beacon.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 11d028f2156e..97f7ae096f69 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -208,6 +208,7 @@ struct ath9k_htc_target_stats {
208 208
209struct ath9k_htc_vif { 209struct ath9k_htc_vif {
210 u8 index; 210 u8 index;
211 u16 seq_no;
211}; 212};
212 213
213struct ath9k_vif_iter_data { 214struct ath9k_vif_iter_data {
@@ -372,7 +373,6 @@ struct ath9k_htc_priv {
372 u16 txpowlimit; 373 u16 txpowlimit;
373 u16 nvifs; 374 u16 nvifs;
374 u16 nstations; 375 u16 nstations;
375 u16 seq_no;
376 u32 bmiss_cnt; 376 u32 bmiss_cnt;
377 bool rearm_ani; 377 bool rearm_ani;
378 bool reconfig_beacon; 378 bool reconfig_beacon;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 133f628dc086..bbbdd60bcb3e 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -207,9 +207,9 @@ void ath9k_htc_swba(struct ath9k_htc_priv *priv, u8 beacon_pending)
207 if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { 207 if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
208 struct ieee80211_hdr *hdr = 208 struct ieee80211_hdr *hdr =
209 (struct ieee80211_hdr *) beacon->data; 209 (struct ieee80211_hdr *) beacon->data;
210 priv->seq_no += 0x10; 210 avp->seq_no += 0x10;
211 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); 211 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
212 hdr->seq_ctrl |= cpu_to_le16(priv->seq_no); 212 hdr->seq_ctrl |= cpu_to_le16(avp->seq_no);
213 } 213 }
214 214
215 tx_ctl.type = ATH9K_HTC_NORMAL; 215 tx_ctl.type = ATH9K_HTC_NORMAL;