mac80211: move MU_MIMO_OWNER flag to ieee80211_vif

Drivers may need to track which vif is using VHT MU-MIMO.
Move the flag indicationg the ownership of MU_MIMO to
ieee80211_vif.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 857089de475f..f41625bcd879 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -6,7 +6,7 @@
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
  * Copyright 2013-2014  Intel Mobile Communications GmbH
- * Copyright (C) 2015 Intel Deutschland GmbH
+ * Copyright (C) 2015 - 2016 Intel Deutschland GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -559,7 +559,7 @@ static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
                 struct ieee80211_sub_if_data *other;
 
                 list_for_each_entry_rcu(other, &local->interfaces, list) {
-                        if (other->flags & IEEE80211_SDATA_MU_MIMO_OWNER) {
+                        if (other->vif.mu_mimo_owner) {
                                 disable_mu_mimo = true;
                                 break;
                         }
@@ -567,7 +567,7 @@ static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
                 if (disable_mu_mimo)
                         cap &= ~IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;
                 else
-                        sdata->flags |= IEEE80211_SDATA_MU_MIMO_OWNER;
+                        sdata->vif.mu_mimo_owner = true;
         }
 
         mask = IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK;
@@ -2052,7 +2052,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
         memset(sdata->vif.bss_conf.mu_group.position, 0,
                sizeof(sdata->vif.bss_conf.mu_group.position));
         changed |= BSS_CHANGED_MU_GROUPS;
-        sdata->flags &= ~IEEE80211_SDATA_MU_MIMO_OWNER;
+        sdata->vif.mu_mimo_owner = false;
 
         sdata->ap_power_level = IEEE80211_UNSET_POWER_LEVEL;
 
@@ -2509,7 +2509,8 @@ static void ieee80211_destroy_assoc_data(struct ieee80211_sub_if_data *sdata,
                 eth_zero_addr(sdata->u.mgd.bssid);
                 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID);
                 sdata->u.mgd.flags = 0;
-                sdata->flags &= ~IEEE80211_SDATA_MU_MIMO_OWNER;
+                sdata->vif.mu_mimo_owner = false;
+
                 mutex_lock(&sdata->local->mtx);
                 ieee80211_vif_release_channel(sdata);
                 mutex_unlock(&sdata->local->mtx);