Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57c9fff3 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0b3acfa7

net/mac80211/driver-trace.c

+3 −0
Original line number Diff line number Diff line 
/* bug in tracepoint.h, it should include this */

#include <linux/module.h>



/* sparse isn't too happy with all macros... */

#ifndef __CHECKER__

#include "driver-ops.h"

#define CREATE_TRACE_POINTS

#include "driver-trace.h"

#endif

net/mac80211/iface.c

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int ieee80211_stop(struct net_device *dev) 


	/* APs need special treatment */

	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;



		/* remove beacon */
@@ -410,7 +410,7 @@ static int ieee80211_stop(struct net_device *dev) 
		kfree(old_beacon);



		/* 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)

			dev_close(vlan->dev);

		WARN_ON(!list_empty(&sdata->u.ap.vlans));