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

Commit aaaa10e0 authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: tracing: avoid 'idx' variable 



This variable shadows something that gets generated inside
the tracing macros, which causes sparse to warn. Avoid it
so sparse output is more readable, even if it doesn't seem
to cause any trouble.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 29e12207

net/wireless/trace.h

+12 −12
Original line number Diff line number Diff line
@@ -770,9 +770,9 @@ DEFINE_EVENT(wiphy_netdev_mac_evt, rdev_set_wds_peer, 
);



TRACE_EVENT(rdev_dump_station,

	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int idx,

	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int _idx,

		 u8 *mac),

	TP_ARGS(wiphy, netdev, idx, mac),

	TP_ARGS(wiphy, netdev, _idx, mac),

	TP_STRUCT__entry(

		WIPHY_ENTRY

		NETDEV_ENTRY
@@ -783,7 +783,7 @@ TRACE_EVENT(rdev_dump_station, 
		WIPHY_ASSIGN;

		NETDEV_ASSIGN;

		MAC_ASSIGN(sta_mac, mac);

		__entry->idx = idx;

		__entry->idx = _idx;

	),

	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: " MAC_PR_FMT ", idx: %d",

		  WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac),
@@ -847,9 +847,9 @@ DEFINE_EVENT(mpath_evt, rdev_get_mpath, 
);



TRACE_EVENT(rdev_dump_mpath,

	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int idx,

	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int _idx,

		 u8 *dst, u8 *next_hop),

	TP_ARGS(wiphy, netdev, idx, dst, next_hop),

	TP_ARGS(wiphy, netdev, _idx, dst, next_hop),

	TP_STRUCT__entry(

		WIPHY_ENTRY

		NETDEV_ENTRY
@@ -862,7 +862,7 @@ TRACE_EVENT(rdev_dump_mpath, 
		NETDEV_ASSIGN;

		MAC_ASSIGN(dst, dst);

		MAC_ASSIGN(next_hop, next_hop);

		__entry->idx = idx;

		__entry->idx = _idx;

	),

	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", index: %d, destination: "

		  MAC_PR_FMT ", next hop: " MAC_PR_FMT,
@@ -892,9 +892,9 @@ TRACE_EVENT(rdev_get_mpp, 
);



TRACE_EVENT(rdev_dump_mpp,

	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int idx,

	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int _idx,

		 u8 *dst, u8 *mpp),

	TP_ARGS(wiphy, netdev, idx, mpp, dst),

	TP_ARGS(wiphy, netdev, _idx, mpp, dst),

	TP_STRUCT__entry(

		WIPHY_ENTRY

		NETDEV_ENTRY
@@ -907,7 +907,7 @@ TRACE_EVENT(rdev_dump_mpp, 
		NETDEV_ASSIGN;

		MAC_ASSIGN(dst, dst);

		MAC_ASSIGN(mpp, mpp);

		__entry->idx = idx;

		__entry->idx = _idx;

	),

	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", index: %d, destination: "

		  MAC_PR_FMT ", mpp: " MAC_PR_FMT,
@@ -1673,8 +1673,8 @@ TRACE_EVENT(rdev_tdls_mgmt, 
);



TRACE_EVENT(rdev_dump_survey,

	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int idx),

	TP_ARGS(wiphy, netdev, idx),

	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int _idx),

	TP_ARGS(wiphy, netdev, _idx),

	TP_STRUCT__entry(

		WIPHY_ENTRY

		NETDEV_ENTRY
@@ -1683,7 +1683,7 @@ TRACE_EVENT(rdev_dump_survey, 
	TP_fast_assign(

		WIPHY_ASSIGN;

		NETDEV_ASSIGN;

		__entry->idx = idx;

		__entry->idx = _idx;

	),

	TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", index: %d",

		  WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->idx)