aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-12-23 07:15:31 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-12-28 16:54:49 -0500
commit9607e6b66a0d25ca63b70d54a4283fa13d8f7c9d (patch)
tree706cb2c2db2df69fa446eb3848b27107b67f2d25 /net/mac80211/mlme.c
parentd30506e0357e5448c7d38bb3739c451dbe4c174e (diff)
mac80211: add ieee80211_sdata_running
Instead of always using netif_running(sdata->dev) use ieee80211_sdata_running(sdata) now which is just an inline containing netif_running() for now. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2f9ed8b9c3f0..7f9909340c09 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -604,7 +604,7 @@ static void ieee80211_chswitch_work(struct work_struct *work)
604 container_of(work, struct ieee80211_sub_if_data, u.mgd.chswitch_work); 604 container_of(work, struct ieee80211_sub_if_data, u.mgd.chswitch_work);
605 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; 605 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
606 606
607 if (!netif_running(sdata->dev)) 607 if (!ieee80211_sdata_running(sdata))
608 return; 608 return;
609 609
610 mutex_lock(&ifmgd->mtx); 610 mutex_lock(&ifmgd->mtx);
@@ -750,7 +750,7 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
750 } 750 }
751 751
752 list_for_each_entry(sdata, &local->interfaces, list) { 752 list_for_each_entry(sdata, &local->interfaces, list) {
753 if (!netif_running(sdata->dev)) 753 if (!ieee80211_sdata_running(sdata))
754 continue; 754 continue;
755 if (sdata->vif.type != NL80211_IFTYPE_STATION) 755 if (sdata->vif.type != NL80211_IFTYPE_STATION)
756 continue; 756 continue;
@@ -1263,7 +1263,7 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
1263 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; 1263 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
1264 bool already = false; 1264 bool already = false;
1265 1265
1266 if (!netif_running(sdata->dev)) 1266 if (!ieee80211_sdata_running(sdata))
1267 return; 1267 return;
1268 1268
1269 if (sdata->local->scanning) 1269 if (sdata->local->scanning)
@@ -2118,7 +2118,7 @@ static void ieee80211_sta_work(struct work_struct *work)
2118 enum rx_mgmt_action rma; 2118 enum rx_mgmt_action rma;
2119 bool anybusy = false; 2119 bool anybusy = false;
2120 2120
2121 if (!netif_running(sdata->dev)) 2121 if (!ieee80211_sdata_running(sdata))
2122 return; 2122 return;
2123 2123
2124 if (local->scanning) 2124 if (local->scanning)