aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-29 09:46:21 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-04 16:43:25 -0400
commit57c9fff3d0c5d77bc7910717faeca4e8a018b1ee (patch)
treece285fab9cb8faeab42b765e8a913fa790c3f46c /net/mac80211/iface.c
parent0b3acfa71a50a1fa1fcee528aa15404ea4ea0877 (diff)
mac80211: fix sparse warnings/errors
sparse complains about a shadowed variable, which we can just rename, and lots of stuff if the API tracer is enabled, so kick out the tracer code in a sparse run -- the macros just confuse it. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 6614d4ff273d..a83087f4237d 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -401,7 +401,7 @@ static int ieee80211_stop(struct net_device *dev)
401 401
402 /* APs need special treatment */ 402 /* APs need special treatment */
403 if (sdata->vif.type == NL80211_IFTYPE_AP) { 403 if (sdata->vif.type == NL80211_IFTYPE_AP) {
404 struct ieee80211_sub_if_data *vlan, *tmp; 404 struct ieee80211_sub_if_data *vlan, *tmpsdata;
405 struct beacon_data *old_beacon = sdata->u.ap.beacon; 405 struct beacon_data *old_beacon = sdata->u.ap.beacon;
406 406
407 /* remove beacon */ 407 /* remove beacon */
@@ -410,7 +410,7 @@ static int ieee80211_stop(struct net_device *dev)
410 kfree(old_beacon); 410 kfree(old_beacon);
411 411
412 /* down all dependent devices, that is VLANs */ 412 /* down all dependent devices, that is VLANs */
413 list_for_each_entry_safe(vlan, tmp, &sdata->u.ap.vlans, 413 list_for_each_entry_safe(vlan, tmpsdata, &sdata->u.ap.vlans,
414 u.vlan.list) 414 u.vlan.list)
415 dev_close(vlan->dev); 415 dev_close(vlan->dev);
416 WARN_ON(!list_empty(&sdata->u.ap.vlans)); 416 WARN_ON(!list_empty(&sdata->u.ap.vlans));