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 14:48:24 -0500 |
| commit | 077f49392819608084c6d8d20e3dcca230afe07d (patch) | |
| tree | 7b19e4537933e9c7e0524421d16701576c4b74b2 /net/mac80211/driver-ops.h | |
| parent | c8987876e9bf9b7b83e75b325586bc77ea8ac825 (diff) | |
| download | op-kernel-dev-077f49392819608084c6d8d20e3dcca230afe07d.zip op-kernel-dev-077f49392819608084c6d8d20e3dcca230afe07d.tar.gz | |
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/driver-ops.h')
| -rw-r--r-- | net/mac80211/driver-ops.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index e8960ae..b8673f6 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); |
