wl12xx: move tx_security_seq into wlvif

The last security seq num has to be saved across reconfigs.
Add a new "persistent" struct into wlvif, which won't get
deleted on wl12xx_init_vif_data()

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index c7be15186c4a..8c35d37ba600 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -755,6 +755,8 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
                                       struct wl1271_tx_hw_res_descr *result)
 {
         struct ieee80211_tx_info *info;
+        struct ieee80211_vif *vif;
+        struct wl12xx_vif *wlvif;
         struct sk_buff *skb;
         int id = result->id;
         int rate = -1;
@@ -774,6 +776,10 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
                 return;
         }
 
+        /* info->control is valid as long as we don't update info->status */
+        vif = info->control.vif;
+        wlvif = wl12xx_vif_to_data(vif);
+
         /* update the TX status info */
         if (result->status == TX_SUCCESS) {
                 if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
@@ -801,14 +807,14 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
              info->control.hw_key->cipher == WLAN_CIPHER_SUITE_CCMP ||
              info->control.hw_key->cipher == WL1271_CIPHER_SUITE_GEM)) {
                 u8 fw_lsb = result->tx_security_sequence_number_lsb;
-                u8 cur_lsb = wl->tx_security_last_seq_lsb;
+                u8 cur_lsb = wlvif->tx_security_last_seq_lsb;
 
                 /*
                  * update security sequence number, taking care of potential
                  * wrap-around
                  */
-                wl->tx_security_seq += (fw_lsb - cur_lsb + 256) % 256;
-                wl->tx_security_last_seq_lsb = fw_lsb;
+                wlvif->tx_security_seq += (fw_lsb - cur_lsb) & 0xff;
+                wlvif->tx_security_last_seq_lsb = fw_lsb;
         }
 
         /* remove private header from packet */