diff options
author | Arik Nemtsov <arik@wizery.com> | 2014-06-11 10:18:21 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-06-23 08:24:55 -0400 |
commit | 31fa97c5defca3895dc6c823096d7ba59df76125 (patch) | |
tree | efaa910e95103d25b3228fd96ed2bd71ac473d86 /net/wireless/trace.h | |
parent | 17e6a59a365ac993c18f762d3a259635957f1026 (diff) |
cfg80211: pass TDLS initiator in tdls_mgmt operations
The TDLS initiator is set once during link setup. If determines the
address ordering in the link identifier IE.
Fix dependent drivers - mwifiex and mac80211.
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/trace.h')
-rw-r--r-- | net/wireless/trace.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 174559aade57..85474ee501eb 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h | |||
@@ -1454,9 +1454,9 @@ TRACE_EVENT(rdev_tdls_mgmt, | |||
1454 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, | 1454 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, |
1455 | u8 *peer, u8 action_code, u8 dialog_token, | 1455 | u8 *peer, u8 action_code, u8 dialog_token, |
1456 | u16 status_code, u32 peer_capability, | 1456 | u16 status_code, u32 peer_capability, |
1457 | const u8 *buf, size_t len), | 1457 | bool initiator, const u8 *buf, size_t len), |
1458 | TP_ARGS(wiphy, netdev, peer, action_code, dialog_token, status_code, | 1458 | TP_ARGS(wiphy, netdev, peer, action_code, dialog_token, status_code, |
1459 | peer_capability, buf, len), | 1459 | peer_capability, initiator, buf, len), |
1460 | TP_STRUCT__entry( | 1460 | TP_STRUCT__entry( |
1461 | WIPHY_ENTRY | 1461 | WIPHY_ENTRY |
1462 | NETDEV_ENTRY | 1462 | NETDEV_ENTRY |
@@ -1465,6 +1465,7 @@ TRACE_EVENT(rdev_tdls_mgmt, | |||
1465 | __field(u8, dialog_token) | 1465 | __field(u8, dialog_token) |
1466 | __field(u16, status_code) | 1466 | __field(u16, status_code) |
1467 | __field(u32, peer_capability) | 1467 | __field(u32, peer_capability) |
1468 | __field(bool, initiator) | ||
1468 | __dynamic_array(u8, buf, len) | 1469 | __dynamic_array(u8, buf, len) |
1469 | ), | 1470 | ), |
1470 | TP_fast_assign( | 1471 | TP_fast_assign( |
@@ -1475,13 +1476,16 @@ TRACE_EVENT(rdev_tdls_mgmt, | |||
1475 | __entry->dialog_token = dialog_token; | 1476 | __entry->dialog_token = dialog_token; |
1476 | __entry->status_code = status_code; | 1477 | __entry->status_code = status_code; |
1477 | __entry->peer_capability = peer_capability; | 1478 | __entry->peer_capability = peer_capability; |
1479 | __entry->initiator = initiator; | ||
1478 | memcpy(__get_dynamic_array(buf), buf, len); | 1480 | memcpy(__get_dynamic_array(buf), buf, len); |
1479 | ), | 1481 | ), |
1480 | TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT ", action_code: %u, " | 1482 | TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT ", action_code: %u, " |
1481 | "dialog_token: %u, status_code: %u, peer_capability: %u buf: %#.2x ", | 1483 | "dialog_token: %u, status_code: %u, peer_capability: %u " |
1484 | "initiator: %s buf: %#.2x ", | ||
1482 | WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer), | 1485 | WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer), |
1483 | __entry->action_code, __entry->dialog_token, | 1486 | __entry->action_code, __entry->dialog_token, |
1484 | __entry->status_code, __entry->peer_capability, | 1487 | __entry->status_code, __entry->peer_capability, |
1488 | BOOL_TO_STR(__entry->initiator), | ||
1485 | ((u8 *)__get_dynamic_array(buf))[0]) | 1489 | ((u8 *)__get_dynamic_array(buf))[0]) |
1486 | ); | 1490 | ); |
1487 | 1491 | ||