lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: switch to ieee80211_sdata_running

Browse Source 
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2010-08-27 12:35:55 +02:00
committed by John W. Linville
parent b9dcf712d1
commit 26a58456be
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/cfg.c
View File

@@ -81,16 +81,14 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
u8 key_idx, const u8 *mac_addr, u8 key_idx, const u8 *mac_addr,
struct key_params *params) 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 sta_info *sta = NULL;
struct ieee80211_key *key; struct ieee80211_key *key;
int err; int err;
if (!netif_running(dev)) if (!ieee80211_sdata_running(sdata))
return -ENETDOWN; return -ENETDOWN;
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
/* reject WEP and TKIP keys if WEP failed to initialize */ /* reject WEP and TKIP keys if WEP failed to initialize */
switch (params->cipher) { switch (params->cipher) {
case WLAN_CIPHER_SUITE_WEP40: case WLAN_CIPHER_SUITE_WEP40:

6
net/mac80211/main.c
View File

@@ -339,9 +339,6 @@ static int ieee80211_ifa_changed(struct notifier_block *nb,
struct ieee80211_if_managed *ifmgd; struct ieee80211_if_managed *ifmgd;
int c = 0; int c = 0;
if (!netif_running(ndev))
return NOTIFY_DONE;
/* Make sure it's our interface that got changed */ /* Make sure it's our interface that got changed */
if (!wdev) if (!wdev)
return NOTIFY_DONE; return NOTIFY_DONE;
@@ -352,6 +349,9 @@ static int ieee80211_ifa_changed(struct notifier_block *nb,
sdata = IEEE80211_DEV_TO_SUB_IF(ndev); sdata = IEEE80211_DEV_TO_SUB_IF(ndev);
bss_conf = &sdata->vif.bss_conf; bss_conf = &sdata->vif.bss_conf;
if (!ieee80211_sdata_running(sdata))
return NOTIFY_DONE;
/* ARP filtering is only supported in managed mode */ /* ARP filtering is only supported in managed mode */
if (sdata->vif.type != NL80211_IFTYPE_STATION) if (sdata->vif.type != NL80211_IFTYPE_STATION)
return NOTIFY_DONE; return NOTIFY_DONE;

2
net/mac80211/util.c
View File

@@ -1308,7 +1308,7 @@ void ieee80211_recalc_smps(struct ieee80211_local *local,
*/ */
list_for_each_entry(sdata, &local->interfaces, list) { list_for_each_entry(sdata, &local->interfaces, list) {
if (!netif_running(sdata->dev)) if (!ieee80211_sdata_running(sdata))
continue; continue;
if (sdata->vif.type != NL80211_IFTYPE_STATION) if (sdata->vif.type != NL80211_IFTYPE_STATION)
goto set; goto set;