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>
This commit is contained in:

committed by
John W. Linville

parent
c8987876e9
commit
077f493928
@@ -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);
|
||||
|
Reference in New Issue
Block a user