wl12xx: make WL1271_FLAG_IBSS_JOINED flag per-vif

This flag should be set per-vif, rather than globally.

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

4 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index d91e8bcccaaa..ac5be7323405 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -3494,11 +3494,11 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 
         if (changed & BSS_CHANGED_IBSS) {
                 if (bss_conf->ibss_joined) {
-                        set_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags);
+                        set_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags);
                         ibss_joined = true;
                 } else {
-                        if (test_and_clear_bit(WL1271_FLAG_IBSS_JOINED,
-                                               &wl->flags)) {
+                        if (test_and_clear_bit(WLVIF_FLAG_IBSS_JOINED,
+                                               &wlvif->flags)) {
                                 wl1271_unjoin(wl, wlvif);
                                 wl12xx_cmd_role_start_dev(wl, wlvif);
                                 wl12xx_roc(wl, wlvif->dev_role_id);
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index 687f59b871ef..765f08ba29af 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -73,7 +73,7 @@ void wl1271_scan_complete_work(struct work_struct *work)
         is_sta = (wlvif->bss_type == BSS_TYPE_STA_BSS);
         is_ibss = (wlvif->bss_type == BSS_TYPE_IBSS);
         if (((is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) ||
-             (is_ibss && !test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags))) &&
+             (is_ibss && !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags))) &&
             !test_bit(wlvif->dev_role_id, wl->roc_map)) {
                 /* restore remain on channel */
                 wl12xx_cmd_role_start_dev(wl, wlvif);
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index bbb101b5de0c..8965fd1384dd 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -193,7 +193,7 @@ u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         wl1271_tx_update_filters(wl, wlvif, skb);
 
         if ((test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags) ||
-             test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags)) &&
+             test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags)) &&
             !ieee80211_is_auth(hdr->frame_control) &&
             !ieee80211_is_assoc_req(hdr->frame_control))
                 return wlvif->sta.hlid;
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index efb35a66fa5e..489c20555dff 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -313,7 +313,6 @@ struct wl1271_ap_key {
 };
 
 enum wl12xx_flags {
-        WL1271_FLAG_IBSS_JOINED,
         WL1271_FLAG_GPIO_POWER,
         WL1271_FLAG_TX_QUEUE_STOPPED,
         WL1271_FLAG_TX_PENDING,
@@ -339,6 +338,7 @@ enum wl12xx_flags {
 
 enum wl12xx_vif_flags {
         WLVIF_FLAG_STA_ASSOCIATED,
+        WLVIF_FLAG_IBSS_JOINED,
 };
 
 struct wl1271_link {