Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26a58456 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: switch to ieee80211_sdata_running 



Since the introduction of ieee80211_sdata_running(),
some new code was introduced that uses netif_running()
instead. Switch all these instances over.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b9dcf712

net/mac80211/cfg.c

+2 −4
Original line number Diff line number Diff line
@@ -81,16 +81,14 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
			     u8 key_idx, const u8 *mac_addr,

			     struct key_params *params)

{

	struct ieee80211_sub_if_data *sdata;

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct sta_info *sta = NULL;

	struct ieee80211_key *key;

	int err;



	if (!netif_running(dev))

	if (!ieee80211_sdata_running(sdata))

		return -ENETDOWN;



	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	/* reject WEP and TKIP keys if WEP failed to initialize */

	switch (params->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

net/mac80211/main.c

+3 −3
Original line number Diff line number Diff line
@@ -339,9 +339,6 @@ static int ieee80211_ifa_changed(struct notifier_block *nb, 
	struct ieee80211_if_managed *ifmgd;

	int c = 0;



	if (!netif_running(ndev))

		return NOTIFY_DONE;



	/* Make sure it's our interface that got changed */

	if (!wdev)

		return NOTIFY_DONE;
@@ -352,6 +349,9 @@ static int ieee80211_ifa_changed(struct notifier_block *nb, 
	sdata = IEEE80211_DEV_TO_SUB_IF(ndev);

	bss_conf = &sdata->vif.bss_conf;



	if (!ieee80211_sdata_running(sdata))

		return NOTIFY_DONE;



	/* ARP filtering is only supported in managed mode */

	if (sdata->vif.type != NL80211_IFTYPE_STATION)

		return NOTIFY_DONE;

net/mac80211/util.c

+1 −1
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ void ieee80211_recalc_smps(struct ieee80211_local *local, 
	 */



	list_for_each_entry(sdata, &local->interfaces, list) {

		if (!netif_running(sdata->dev))

		if (!ieee80211_sdata_running(sdata))

			continue;

		if (sdata->vif.type != NL80211_IFTYPE_STATION)

			goto set;