From: Sujith Manoharan Date: Mon, 21 Feb 2011 02:18:53 +0000 (+0530) Subject: ath9k_htc: Make sequence number calculation per-VIF X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9a3d025be11a1da625f8a71636b55a3bd3718574;p=deliverable%2Flinux.git ath9k_htc: Make sequence number calculation per-VIF Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville --- 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 { struct ath9k_htc_vif { u8 index; + u16 seq_no; }; struct ath9k_vif_iter_data { @@ -372,7 +373,6 @@ struct ath9k_htc_priv { u16 txpowlimit; u16 nvifs; u16 nstations; - u16 seq_no; u32 bmiss_cnt; bool rearm_ani; 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) if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) beacon->data; - priv->seq_no += 0x10; + avp->seq_no += 0x10; hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); - hdr->seq_ctrl |= cpu_to_le16(priv->seq_no); + hdr->seq_ctrl |= cpu_to_le16(avp->seq_no); } tx_ctl.type = ATH9K_HTC_NORMAL;