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>
This commit is contained in:
parent
0b3acfa71a
commit
57c9fff3d0
|
@ -1,6 +1,9 @@
|
||||||
/* bug in tracepoint.h, it should include this */
|
/* bug in tracepoint.h, it should include this */
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
|
|
||||||
|
/* sparse isn't too happy with all macros... */
|
||||||
|
#ifndef __CHECKER__
|
||||||
#include "driver-ops.h"
|
#include "driver-ops.h"
|
||||||
#define CREATE_TRACE_POINTS
|
#define CREATE_TRACE_POINTS
|
||||||
#include "driver-trace.h"
|
#include "driver-trace.h"
|
||||||
|
#endif
|
||||||
|
|
|
@ -401,7 +401,7 @@ static int ieee80211_stop(struct net_device *dev)
|
||||||
|
|
||||||
/* APs need special treatment */
|
/* APs need special treatment */
|
||||||
if (sdata->vif.type == NL80211_IFTYPE_AP) {
|
if (sdata->vif.type == NL80211_IFTYPE_AP) {
|
||||||
struct ieee80211_sub_if_data *vlan, *tmp;
|
struct ieee80211_sub_if_data *vlan, *tmpsdata;
|
||||||
struct beacon_data *old_beacon = sdata->u.ap.beacon;
|
struct beacon_data *old_beacon = sdata->u.ap.beacon;
|
||||||
|
|
||||||
/* remove beacon */
|
/* remove beacon */
|
||||||
|
@ -410,7 +410,7 @@ static int ieee80211_stop(struct net_device *dev)
|
||||||
kfree(old_beacon);
|
kfree(old_beacon);
|
||||||
|
|
||||||
/* down all dependent devices, that is VLANs */
|
/* down all dependent devices, that is VLANs */
|
||||||
list_for_each_entry_safe(vlan, tmp, &sdata->u.ap.vlans,
|
list_for_each_entry_safe(vlan, tmpsdata, &sdata->u.ap.vlans,
|
||||||
u.vlan.list)
|
u.vlan.list)
|
||||||
dev_close(vlan->dev);
|
dev_close(vlan->dev);
|
||||||
WARN_ON(!list_empty(&sdata->u.ap.vlans));
|
WARN_ON(!list_empty(&sdata->u.ap.vlans));
|
||||||
|
|
Loading…
Reference in New Issue