aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-08-27 06:35:55 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-27 13:53:30 -0400
commit26a58456be40d8181b884eb5b4e61e3f73ba94e0 (patch)
treed3284dcba4f286d1f666b1efca136c018791e692 /net/mac80211/main.c
parentb9dcf712d1fb98bf279fcd453a42a763b104961d (diff)
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: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 964c267163a0..93194f61adb0 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -339,9 +339,6 @@ static int ieee80211_ifa_changed(struct notifier_block *nb,
339 struct ieee80211_if_managed *ifmgd; 339 struct ieee80211_if_managed *ifmgd;
340 int c = 0; 340 int c = 0;
341 341
342 if (!netif_running(ndev))
343 return NOTIFY_DONE;
344
345 /* Make sure it's our interface that got changed */ 342 /* Make sure it's our interface that got changed */
346 if (!wdev) 343 if (!wdev)
347 return NOTIFY_DONE; 344 return NOTIFY_DONE;
@@ -352,6 +349,9 @@ static int ieee80211_ifa_changed(struct notifier_block *nb,
352 sdata = IEEE80211_DEV_TO_SUB_IF(ndev); 349 sdata = IEEE80211_DEV_TO_SUB_IF(ndev);
353 bss_conf = &sdata->vif.bss_conf; 350 bss_conf = &sdata->vif.bss_conf;
354 351
352 if (!ieee80211_sdata_running(sdata))
353 return NOTIFY_DONE;
354
355 /* ARP filtering is only supported in managed mode */ 355 /* ARP filtering is only supported in managed mode */
356 if (sdata->vif.type != NL80211_IFTYPE_STATION) 356 if (sdata->vif.type != NL80211_IFTYPE_STATION)
357 return NOTIFY_DONE; 357 return NOTIFY_DONE;