summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-01-20 13:55:18 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-02-06 14:48:24 -0500
commit077f49392819608084c6d8d20e3dcca230afe07d (patch)
tree7b19e4537933e9c7e0524421d16701576c4b74b2 /net
parentc8987876e9bf9b7b83e75b325586bc77ea8ac825 (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/driver-ops.h2
-rw-r--r--net/mac80211/key.c8
-rw-r--r--net/mac80211/pm.c11
-rw-r--r--net/mac80211/sta_info.c8
-rw-r--r--net/mac80211/util.c11
5 files changed, 7 insertions, 33 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index e8960ae3986..b8673f6100d 100644
--- 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 87a89741432..94f02b577d4 100644
--- 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 596efaf50e0..c65ff471acc 100644
--- 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 fa0823892b2..8e1e361c223 100644
--- 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 d82d886d086..d4966e88aa4 100644
--- 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);