diff options
-rw-r--r-- | net/mac80211/driver-trace.c | 3 | ||||
-rw-r--r-- | net/mac80211/iface.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/driver-trace.c b/net/mac80211/driver-trace.c index 6da6f79932fc..8ed8711b1a6d 100644 --- a/net/mac80211/driver-trace.c +++ b/net/mac80211/driver-trace.c | |||
@@ -1,6 +1,9 @@ | |||
1 | /* bug in tracepoint.h, it should include this */ | 1 | /* bug in tracepoint.h, it should include this */ |
2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
3 | 3 | ||
4 | /* sparse isn't too happy with all macros... */ | ||
5 | #ifndef __CHECKER__ | ||
4 | #include "driver-ops.h" | 6 | #include "driver-ops.h" |
5 | #define CREATE_TRACE_POINTS | 7 | #define CREATE_TRACE_POINTS |
6 | #include "driver-trace.h" | 8 | #include "driver-trace.h" |
9 | #endif | ||
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)); |