aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.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/rx.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/rx.c')
-rw-r--r--net/mac80211/rx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 6cbf1a7b3157..f60dfca52196 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -289,7 +289,7 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb,
289 if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) 289 if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES)
290 continue; 290 continue;
291 291
292 if (!netif_running(sdata->dev)) 292 if (!ieee80211_sdata_running(sdata))
293 continue; 293 continue;
294 294
295 if (prev_dev) { 295 if (prev_dev) {
@@ -2056,7 +2056,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,
2056 skb->protocol = htons(ETH_P_802_2); 2056 skb->protocol = htons(ETH_P_802_2);
2057 2057
2058 list_for_each_entry_rcu(sdata, &local->interfaces, list) { 2058 list_for_each_entry_rcu(sdata, &local->interfaces, list) {
2059 if (!netif_running(sdata->dev)) 2059 if (!ieee80211_sdata_running(sdata))
2060 continue; 2060 continue;
2061 2061
2062 if (sdata->vif.type != NL80211_IFTYPE_MONITOR || 2062 if (sdata->vif.type != NL80211_IFTYPE_MONITOR ||
@@ -2318,7 +2318,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
2318 } 2318 }
2319 if (!found_sta) { 2319 if (!found_sta) {
2320 list_for_each_entry_rcu(sdata, &local->interfaces, list) { 2320 list_for_each_entry_rcu(sdata, &local->interfaces, list) {
2321 if (!netif_running(sdata->dev)) 2321 if (!ieee80211_sdata_running(sdata))
2322 continue; 2322 continue;
2323 2323
2324 if (sdata->vif.type == NL80211_IFTYPE_MONITOR || 2324 if (sdata->vif.type == NL80211_IFTYPE_MONITOR ||