suyu-github/horinux
0
0
Fork 0
mirror of https://github.com/suyu-emu/horinux.git synced 2026-09-21 14:15:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: remove unnecessary mesh check

Browse Source 
sta_info_get_bss() is equivalent to sta_info_get() in the
mesh case, since sta->sdata->bss will be NULL (it's only
set for AP/AP_VLAN interfaces.) Thus, the mesh check here
isn't actually needed - remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg
2016-10-12 10:50:36 +02:00
parent 6b25e21fa6
commit 850092db5a
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/mac80211/cfg.c
+1 -4
View File
@@ -357,10 +357,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
mutex_lock(&local->sta_mtx); mutex_lock(&local->sta_mtx);
if (mac_addr) { if (mac_addr) {
if (ieee80211_vif_is_mesh(&sdata->vif)) sta = sta_info_get_bss(sdata, mac_addr);
sta = sta_info_get(sdata, mac_addr);
else
sta = sta_info_get_bss(sdata, mac_addr);
/* /*
* The ASSOC test makes sure the driver is ready to * The ASSOC test makes sure the driver is ready to
* receive the key. When wpa_supplicant has roamed * receive the key. When wpa_supplicant has roamed