aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.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/util.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/util.c')
-rw-r--r--net/mac80211/util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index b01972579c7c..5ffe9e831b66 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -468,7 +468,7 @@ void ieee80211_iterate_active_interfaces(
468 case NL80211_IFTYPE_MESH_POINT: 468 case NL80211_IFTYPE_MESH_POINT:
469 break; 469 break;
470 } 470 }
471 if (netif_running(sdata->dev)) 471 if (ieee80211_sdata_running(sdata))
472 iterator(data, sdata->vif.addr, 472 iterator(data, sdata->vif.addr,
473 &sdata->vif); 473 &sdata->vif);
474 } 474 }
@@ -502,7 +502,7 @@ void ieee80211_iterate_active_interfaces_atomic(
502 case NL80211_IFTYPE_MESH_POINT: 502 case NL80211_IFTYPE_MESH_POINT:
503 break; 503 break;
504 } 504 }
505 if (netif_running(sdata->dev)) 505 if (ieee80211_sdata_running(sdata))
506 iterator(data, sdata->vif.addr, 506 iterator(data, sdata->vif.addr,
507 &sdata->vif); 507 &sdata->vif);
508 } 508 }
@@ -1056,7 +1056,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
1056 list_for_each_entry(sdata, &local->interfaces, list) { 1056 list_for_each_entry(sdata, &local->interfaces, list) {
1057 if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN && 1057 if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
1058 sdata->vif.type != NL80211_IFTYPE_MONITOR && 1058 sdata->vif.type != NL80211_IFTYPE_MONITOR &&
1059 netif_running(sdata->dev)) { 1059 ieee80211_sdata_running(sdata)) {
1060 conf.vif = &sdata->vif; 1060 conf.vif = &sdata->vif;
1061 conf.type = sdata->vif.type; 1061 conf.type = sdata->vif.type;
1062 conf.mac_addr = sdata->vif.addr; 1062 conf.mac_addr = sdata->vif.addr;
@@ -1103,7 +1103,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
1103 /* Finally also reconfigure all the BSS information */ 1103 /* Finally also reconfigure all the BSS information */
1104 list_for_each_entry(sdata, &local->interfaces, list) { 1104 list_for_each_entry(sdata, &local->interfaces, list) {
1105 u32 changed = ~0; 1105 u32 changed = ~0;
1106 if (!netif_running(sdata->dev)) 1106 if (!ieee80211_sdata_running(sdata))
1107 continue; 1107 continue;
1108 switch (sdata->vif.type) { 1108 switch (sdata->vif.type) {
1109 case NL80211_IFTYPE_STATION: 1109 case NL80211_IFTYPE_STATION:
@@ -1131,7 +1131,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
1131 1131
1132 /* add back keys */ 1132 /* add back keys */
1133 list_for_each_entry(sdata, &local->interfaces, list) 1133 list_for_each_entry(sdata, &local->interfaces, list)
1134 if (netif_running(sdata->dev)) 1134 if (ieee80211_sdata_running(sdata))
1135 ieee80211_enable_keys(sdata); 1135 ieee80211_enable_keys(sdata);
1136 1136
1137 ieee80211_wake_queues_by_reason(hw, 1137 ieee80211_wake_queues_by_reason(hw,