Commit 850092db authored by Johannes Berg's avatar Johannes Berg

mac80211: remove unnecessary mesh check

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6b25e21f
...@@ -357,10 +357,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment