Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 57c9fff3d0c5d77bc7910717faeca4e8a018b1ee

Authored by Johannes Berg
Committed by John W. Linville
1 parent 0b3acfa71a
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 5 additions and 2 deletions Side-by-side Diff

net/mac80211/driver-trace.c
Diff comments   View file @ 57c9fff
1 1 /* bug in tracepoint.h, it should include this */
2 2 #include <linux/module.h>
3 3  
  4 +/* sparse isn't too happy with all macros... */
  5 +#ifndef __CHECKER__
4 6 #include "driver-ops.h"
5 7 #define CREATE_TRACE_POINTS
6 8 #include "driver-trace.h"
  9 +#endif
net/mac80211/iface.c
Diff comments   View file @ 57c9fff
... ... @@ -401,7 +401,7 @@
401 401  
402 402 /* APs need special treatment */
403 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 405 struct beacon_data *old_beacon = sdata->u.ap.beacon;
406 406  
407 407 /* remove beacon */
... ... @@ -410,7 +410,7 @@
410 410 kfree(old_beacon);
411 411  
412 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 414 u.vlan.list)
415 415 dev_close(vlan->dev);
416 416 WARN_ON(!list_empty(&sdata->u.ap.vlans));