From d6a47bfb72f495a72637fbe635220f6af0f4cb6f Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Tue, 21 Nov 2017 16:35:43 +0000 Subject: backports:Backports for tegra 3.1 and 3.10 kernels Signed-off-by: Dominik Sliwa --- net/wireless/trace.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'net') diff --git a/net/wireless/trace.h b/net/wireless/trace.h index b0446c2..ab61aa6 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -12,6 +12,9 @@ #include #include "core.h" +#ifndef BACKPORTS_TRACE +#define BACKPORTS_TRACE + #define MAC_ENTRY(entry_mac) __array(u8, entry_mac, ETH_ALEN) #define MAC_ASSIGN(entry_mac, given_mac) do { \ if (given_mac) \ @@ -213,6 +216,18 @@ /************************************************************* * rdev->ops traces * *************************************************************/ +#if LINUX_VERSION_IS_LESS(4,0,0) +#undef TP_PROTO +#define TP_PROTO(args...) args +#undef DECLARE_TRACE +#define DECLARE_TRACE(args...) +#undef DEFINE_EVENT +#define DEFINE_EVENT(skip,name,proto,args...) inline void trace_##name(proto){} +#undef TRACE_EVENT +#define TRACE_EVENT(name,proto,args...) inline void trace_##name(proto){} +#endif +DEFINE_EVENT(skip, rdev_set_multicast_to_unicast, + TP_PROTO(struct wiphy *wiphy, struct net_device *dev, bool ena), a); TRACE_EVENT(rdev_suspend, TP_PROTO(struct wiphy *wiphy, struct cfg80211_wowlan *wow), @@ -278,6 +293,9 @@ TRACE_EVENT(rdev_scan, TP_printk(WIPHY_PR_FMT, WIPHY_PR_ARG) ); +#undef DECLARE_EVENT_CLASS +#define DECLARE_EVENT_CLASS(args...) + DECLARE_EVENT_CLASS(wiphy_only_evt, TP_PROTO(struct wiphy *wiphy), TP_ARGS(wiphy), @@ -3227,25 +3245,6 @@ DEFINE_EVENT(wiphy_wdev_evt, rdev_abort_scan, TP_ARGS(wiphy, wdev) ); -TRACE_EVENT(rdev_set_multicast_to_unicast, - TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, - const bool enabled), - TP_ARGS(wiphy, netdev, enabled), - TP_STRUCT__entry( - WIPHY_ENTRY - NETDEV_ENTRY - __field(bool, enabled) - ), - TP_fast_assign( - WIPHY_ASSIGN; - NETDEV_ASSIGN; - __entry->enabled = enabled; - ), - TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", unicast: %s", - WIPHY_PR_ARG, NETDEV_PR_ARG, - BOOL_TO_STR(__entry->enabled)) -); - TRACE_EVENT(rdev_get_txq_stats, TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev), TP_ARGS(wiphy, wdev), @@ -3259,6 +3258,7 @@ TRACE_EVENT(rdev_get_txq_stats, ), TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT, WIPHY_PR_ARG, WDEV_PR_ARG) ); +#endif /* BACKPORTS_TRACE */ #endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH -- cgit v1.2.3