diff options
author | Sunil Dutt Undekari <usdutt@qti.qualcomm.com> | 2014-02-20 05:52:09 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 05:55:25 -0500 |
commit | df942e7ba70cd0a7aa9e0432b8a6a328de2c5574 (patch) | |
tree | 943599f26af1396618079dc1c789df49e7b1c654 /net/wireless/trace.h | |
parent | bf5f48339a019c9b4b42284c3f45d58942cbda27 (diff) |
cfg80211: Pass TDLS peer capability information in tdls_mgmt
While framing the TDLS Setup Confirmation frame, the driver needs to
know if the TDLS peer is VHT/HT/WMM capable and thus shall construct
the VHT/HT operation / WMM parameter elements accordingly. Supplicant
determines if the TDLS peer is VHT/HT/WMM capable based on the
presence of the respective IEs in the received TDLS Setup Response frame.
The host driver should not need to parse the received TDLS Response
frame and thus, should be able to rely on the supplicant to indicate
the capability of the peer through additional flags while transmitting
the TDLS Setup Confirmation frame through tdls_mgmt operations.
Signed-off-by: Sunil Dutt Undekari <usdutt@qti.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/trace.h')
-rw-r--r-- | net/wireless/trace.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 5eaeed59db07..aabccf13e07b 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h | |||
@@ -1468,9 +1468,10 @@ TRACE_EVENT(rdev_sched_scan_start, | |||
1468 | TRACE_EVENT(rdev_tdls_mgmt, | 1468 | TRACE_EVENT(rdev_tdls_mgmt, |
1469 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, | 1469 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, |
1470 | u8 *peer, u8 action_code, u8 dialog_token, | 1470 | u8 *peer, u8 action_code, u8 dialog_token, |
1471 | u16 status_code, const u8 *buf, size_t len), | 1471 | u16 status_code, u32 peer_capability, |
1472 | const u8 *buf, size_t len), | ||
1472 | TP_ARGS(wiphy, netdev, peer, action_code, dialog_token, status_code, | 1473 | TP_ARGS(wiphy, netdev, peer, action_code, dialog_token, status_code, |
1473 | buf, len), | 1474 | peer_capability, buf, len), |
1474 | TP_STRUCT__entry( | 1475 | TP_STRUCT__entry( |
1475 | WIPHY_ENTRY | 1476 | WIPHY_ENTRY |
1476 | NETDEV_ENTRY | 1477 | NETDEV_ENTRY |
@@ -1478,6 +1479,7 @@ TRACE_EVENT(rdev_tdls_mgmt, | |||
1478 | __field(u8, action_code) | 1479 | __field(u8, action_code) |
1479 | __field(u8, dialog_token) | 1480 | __field(u8, dialog_token) |
1480 | __field(u16, status_code) | 1481 | __field(u16, status_code) |
1482 | __field(u32, peer_capability) | ||
1481 | __dynamic_array(u8, buf, len) | 1483 | __dynamic_array(u8, buf, len) |
1482 | ), | 1484 | ), |
1483 | TP_fast_assign( | 1485 | TP_fast_assign( |
@@ -1487,13 +1489,15 @@ TRACE_EVENT(rdev_tdls_mgmt, | |||
1487 | __entry->action_code = action_code; | 1489 | __entry->action_code = action_code; |
1488 | __entry->dialog_token = dialog_token; | 1490 | __entry->dialog_token = dialog_token; |
1489 | __entry->status_code = status_code; | 1491 | __entry->status_code = status_code; |
1492 | __entry->peer_capability = peer_capability; | ||
1490 | memcpy(__get_dynamic_array(buf), buf, len); | 1493 | memcpy(__get_dynamic_array(buf), buf, len); |
1491 | ), | 1494 | ), |
1492 | TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT ", action_code: %u, " | 1495 | TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT ", action_code: %u, " |
1493 | "dialog_token: %u, status_code: %u, buf: %#.2x ", | 1496 | "dialog_token: %u, status_code: %u, peer_capability: %u buf: %#.2x ", |
1494 | WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer), | 1497 | WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer), |
1495 | __entry->action_code, __entry->dialog_token, | 1498 | __entry->action_code, __entry->dialog_token, |
1496 | __entry->status_code, ((u8 *)__get_dynamic_array(buf))[0]) | 1499 | __entry->status_code, __entry->peer_capability, |
1500 | ((u8 *)__get_dynamic_array(buf))[0]) | ||
1497 | ); | 1501 | ); |
1498 | 1502 | ||
1499 | TRACE_EVENT(rdev_dump_survey, | 1503 | TRACE_EVENT(rdev_dump_survey, |