Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[sfrench/cifs-2.6.git] / net / wireless / trace.h

diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index 018c81fa72fb0b3d383ceff5bb60a41428bf3f63..55fb279a519690b34bac9a11c610fe4ca2d8b0c4 100644 (file)
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -1882,6 +1882,32 @@ TRACE_EVENT(rdev_mgmt_tx,
                  BOOL_TO_STR(__entry->dont_wait_for_ack))
 );
 
+TRACE_EVENT(rdev_tx_control_port,
+       TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
+                const u8 *buf, size_t len, const u8 *dest, __be16 proto,
+                bool unencrypted),
+       TP_ARGS(wiphy, netdev, buf, len, dest, proto, unencrypted),
+       TP_STRUCT__entry(
+               WIPHY_ENTRY
+               NETDEV_ENTRY
+               MAC_ENTRY(dest)
+               __field(__be16, proto)
+               __field(bool, unencrypted)
+       ),
+       TP_fast_assign(
+               WIPHY_ASSIGN;
+               NETDEV_ASSIGN;
+               MAC_ASSIGN(dest, dest);
+               __entry->proto = proto;
+               __entry->unencrypted = unencrypted;
+       ),
+       TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT ","
+                 " proto: 0x%x, unencrypted: %s",
+                 WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(dest),
+                 be16_to_cpu(__entry->proto),
+                 BOOL_TO_STR(__entry->unencrypted))
+);
+
 TRACE_EVENT(rdev_set_noack_map,
        TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
                 u16 noack_map),
@@ -2600,6 +2626,27 @@ TRACE_EVENT(cfg80211_mgmt_tx_status,
                  WDEV_PR_ARG, __entry->cookie, BOOL_TO_STR(__entry->ack))
 );
 
+TRACE_EVENT(cfg80211_rx_control_port,
+       TP_PROTO(struct net_device *netdev, const u8 *buf, size_t len,
+                const u8 *addr, u16 proto, bool unencrypted),
+       TP_ARGS(netdev, buf, len, addr, proto, unencrypted),
+       TP_STRUCT__entry(
+               NETDEV_ENTRY
+               MAC_ENTRY(addr)
+               __field(u16, proto)
+               __field(bool, unencrypted)
+       ),
+       TP_fast_assign(
+               NETDEV_ASSIGN;
+               MAC_ASSIGN(addr, addr);
+               __entry->proto = proto;
+               __entry->unencrypted = unencrypted;
+       ),
+       TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT " proto: 0x%x, unencrypted: %s",
+                 NETDEV_PR_ARG, MAC_PR_ARG(addr),
+                 __entry->proto, BOOL_TO_STR(__entry->unencrypted))
+);
+
 TRACE_EVENT(cfg80211_cqm_rssi_notify,
        TP_PROTO(struct net_device *netdev,
                 enum nl80211_cqm_rssi_threshold_event rssi_event,