mac80211: simplify AP_VLAN handling

Setting keys and updating TKIP keys must use the
BSS sdata (not AP_VLAN), so we translate. Move
the translation into driver-ops wrappers instead
of having it inline in the code to simplify the
normal code flow.

The same can be done for sta_add/remove which
already does the translation in the wrapper.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index e8960ae3986126aadd0b4254909d7b9b45fd07c9..b8673f6100df5f32e8084e58f460a294fc3a90f5 100644 (file)
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -253,6 +253,7 @@ static inline int drv_set_key(struct ieee80211_local *local,
 
        might_sleep();
 
+       sdata = get_bss_sdata(sdata);
        check_sdata_in_driver(sdata);
 
        trace_drv_set_key(local, cmd, sdata, sta, key);
@@ -272,6 +273,7 @@ static inline void drv_update_tkip_key(struct ieee80211_local *local,
        if (sta)
                ista = &sta->sta;
 
+       sdata = get_bss_sdata(sdata);
        check_sdata_in_driver(sdata);
 
        trace_drv_update_tkip_key(local, sdata, conf, ista, iv32);

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 87a89741432dce811cdb31168036788146f5721b..94f02b577d44eced31966810b3f345a9f022bcb0 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -123,9 +123,6 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
                 */
                if (!(key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE))
                        goto out_unsupported;
-               sdata = container_of(sdata->bss,
-                                    struct ieee80211_sub_if_data,
-                                    u.ap);
        }
 
        ret = drv_set_key(key->local, SET_KEY, sdata, sta, &key->conf);
@@ -187,11 +184,6 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
              (key->conf.flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)))
                increment_tailroom_need_count(sdata);
 
-       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-               sdata = container_of(sdata->bss,
-                                    struct ieee80211_sub_if_data,
-                                    u.ap);
-
        ret = drv_set_key(key->local, DISABLE_KEY, sdata,
                          sta, &key->conf);
 

diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 596efaf50e096c354aaa3fb0c01abefe1afe87ab..c65ff471acce952aec185056384e113f3588f9ec 100644 (file)
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -97,15 +97,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
        /* tear down aggregation sessions and remove STAs */
        mutex_lock(&local->sta_mtx);
        list_for_each_entry(sta, &local->sta_list, list) {
-               if (sta->uploaded) {
-                       sdata = sta->sdata;
-                       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-                               sdata = container_of(sdata->bss,
-                                            struct ieee80211_sub_if_data,
-                                            u.ap);
-
-                       drv_sta_remove(local, sdata, &sta->sta);
-               }
+               if (sta->uploaded)
+                       drv_sta_remove(local, sta->sdata, &sta->sta);
 
                mesh_plink_quiesce(sta);
        }

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index fa0823892b2da16e7d4f8cc89a141eccd2a16d3e..8e1e361c2232cce53311f042ee162483a910bb29 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -764,14 +764,8 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
                }
        }
 
-       if (sta->uploaded) {
-               if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-                       sdata = container_of(sdata->bss,
-                                            struct ieee80211_sub_if_data,
-                                            u.ap);
+       if (sta->uploaded)
                drv_sta_remove(local, sdata, &sta->sta);
-               sdata = sta->sdata;
-       }
 
        /*
         * At this point, after we wait for an RCU grace period,

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index d82d886d0867975ec19ffbe3b2615da3e07d37f6..d4966e88aa4995a651e735a3befbe3829717fd75 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1184,15 +1184,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)
        /* add STAs back */
        mutex_lock(&local->sta_mtx);
        list_for_each_entry(sta, &local->sta_list, list) {
-               if (sta->uploaded) {
-                       sdata = sta->sdata;
-                       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-                               sdata = container_of(sdata->bss,
-                                            struct ieee80211_sub_if_data,
-                                            u.ap);
-
-                       WARN_ON(drv_sta_add(local, sdata, &sta->sta));
-               }
+               if (sta->uploaded)
+                       WARN_ON(drv_sta_add(local, sta->sdata, &sta->sta));
        }
        mutex_unlock(&local->sta_mtx);