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: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index fd6541f3ade3e1342ac0fdce3ae3403de5752770..7d0172395589f5372f48d08a795fa4be976a765a 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -357,10 +357,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
        mutex_lock(&local->sta_mtx);
 
        if (mac_addr) {
-               if (ieee80211_vif_is_mesh(&sdata->vif))
-                       sta = sta_info_get(sdata, mac_addr);
-               else
-                       sta = sta_info_get_bss(sdata, mac_addr);
+               sta = sta_info_get_bss(sdata, mac_addr);
                /*
                 * The ASSOC test makes sure the driver is ready to
                 * receive the key. When wpa_supplicant has roamed