Commit 850092db authored Oct 04, 2016 by 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: Johannes Berg <johannes.berg@intel.com>

parent 6b25e21f

net/mac80211/cfg.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -357,9 +357,6 @@ 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);
		/*
		* The ASSOC test makes sure the driver is ready to