wl12xx: move aid into wlvif

move aid into the per-interface data, rather than
being global.

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

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 006e17458130cfd9282eafabc0c4cf80797d4932..e0a557fc3a31bf44834e6c792ce626584591c9ce 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2217,7 +2217,7 @@ static int wl1271_join(struct wl1271 *wl, struct wl12xx_vif *wlvif,
        if (ret < 0)
                goto out;
 
-       ret = wl1271_acx_aid(wl, wl->aid);
+       ret = wl1271_acx_aid(wl, wlvif->aid);
        if (ret < 0)
                goto out;
 
@@ -3487,7 +3487,7 @@ sta_not_found:
                if (bss_conf->assoc) {
                        u32 rates;
                        int ieoffset;
-                       wl->aid = bss_conf->aid;
+                       wlvif->aid = bss_conf->aid;
                        set_assoc = true;
 
                        wl->ps_poll_failures = 0;
@@ -3518,7 +3518,7 @@ sta_not_found:
                         * updates it by itself when the first beacon is
                         * received after a join.
                         */
-                       ret = wl1271_cmd_build_ps_poll(wl, wlvif, wl->aid);
+                       ret = wl1271_cmd_build_ps_poll(wl, wlvif, wlvif->aid);
                        if (ret < 0)
                                goto out;
 
@@ -3544,7 +3544,7 @@ sta_not_found:
                        bool was_ifup =
                            !!test_and_clear_bit(WL1271_FLAG_STA_STATE_SENT,
                                                 &wl->flags);
-                       wl->aid = 0;
+                       wlvif->aid = 0;
 
                        /* free probe-request template */
                        dev_kfree_skb(wlvif->probereq);

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 8d100561522c255437f76bb25d9bd36bfaeea0f4..e6d3c214acf9114d9f57c049ce0eb80d088eefe2 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -507,9 +507,6 @@ struct wl1271 {
 
        bool sched_scanning;
 
-       /* Our association ID */
-       u16 aid;
-
        u32 bitrate_masks[IEEE80211_NUM_BANDS];
 
        /* The current band */
@@ -641,6 +638,9 @@ struct wl12xx_vif {
 
        /* probe-req template for the current AP */
        struct sk_buff *probereq;
+
+       /* Our association ID */
+       u16 aid;
 };
 
 static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)