diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-01-20 13:55:18 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 20:48:24 +0100 |
| commit | 077f49392819608084c6d8d20e3dcca230afe07d (patch) | |
| tree | 7b19e4537933e9c7e0524421d16701576c4b74b2 /net/mac80211/key.c | |
| parent | mac80211: move managed mode station state modification (diff) | |
| download | linux-077f49392819608084c6d8d20e3dcca230afe07d.tar.xz linux-077f49392819608084c6d8d20e3dcca230afe07d.zip | |
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/mac80211/key.c')
| -rw-r--r-- | net/mac80211/key.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 87a89741432d..94f02b577d44 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); |