diff options
author | Rostislav Lisovy <lisovy@gmail.com> | 2014-11-03 04:33:18 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-04 07:18:17 -0500 |
commit | 6e0bd6c35b021dc73a81ebd1ef79761233c48b50 (patch) | |
tree | f3da02d8006a5ff98f3dd33a37dc1eddafd7b85c /net/wireless/trace.h | |
parent | 5b3dc42b1b0db0264bbbe4ae44c15ab97bfd1e93 (diff) |
cfg80211: 802.11p OCB mode handling
This patch adds new iface type (NL80211_IFTYPE_OCB) representing
the OCB (Outside the Context of a BSS) mode.
When establishing a connection to the network a cfg80211_join_ocb
function is called (particular nl80211_command is added as well).
A mandatory parameters during the ocb_join operation are 'center
frequency' and 'channel width (5/10 MHz)'.
Changes done in mac80211 are minimal possible required to avoid
many warnings (warning: enumeration value 'NL80211_IFTYPE_OCB'
not handled in switch) during compilation. Full functionality
(where needed) is added in the following patch.
Signed-off-by: Rostislav Lisovy <rostislav.lisovy@fel.cvut.cz>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/trace.h')
-rw-r--r-- | net/wireless/trace.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/net/wireless/trace.h b/net/wireless/trace.h index cdb2c2ef1ae1..277a85df910e 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h | |||
@@ -600,6 +600,11 @@ DEFINE_EVENT(wiphy_netdev_evt, rdev_leave_ibss, | |||
600 | TP_ARGS(wiphy, netdev) | 600 | TP_ARGS(wiphy, netdev) |
601 | ); | 601 | ); |
602 | 602 | ||
603 | DEFINE_EVENT(wiphy_netdev_evt, rdev_leave_ocb, | ||
604 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev), | ||
605 | TP_ARGS(wiphy, netdev) | ||
606 | ); | ||
607 | |||
603 | DEFINE_EVENT(wiphy_netdev_evt, rdev_flush_pmksa, | 608 | DEFINE_EVENT(wiphy_netdev_evt, rdev_flush_pmksa, |
604 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev), | 609 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev), |
605 | TP_ARGS(wiphy, netdev) | 610 | TP_ARGS(wiphy, netdev) |
@@ -1316,6 +1321,22 @@ TRACE_EVENT(rdev_join_ibss, | |||
1316 | WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid), __entry->ssid) | 1321 | WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid), __entry->ssid) |
1317 | ); | 1322 | ); |
1318 | 1323 | ||
1324 | TRACE_EVENT(rdev_join_ocb, | ||
1325 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, | ||
1326 | const struct ocb_setup *setup), | ||
1327 | TP_ARGS(wiphy, netdev, setup), | ||
1328 | TP_STRUCT__entry( | ||
1329 | WIPHY_ENTRY | ||
1330 | NETDEV_ENTRY | ||
1331 | ), | ||
1332 | TP_fast_assign( | ||
1333 | WIPHY_ASSIGN; | ||
1334 | NETDEV_ASSIGN; | ||
1335 | ), | ||
1336 | TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT, | ||
1337 | WIPHY_PR_ARG, NETDEV_PR_ARG) | ||
1338 | ); | ||
1339 | |||
1319 | TRACE_EVENT(rdev_set_wiphy_params, | 1340 | TRACE_EVENT(rdev_set_wiphy_params, |
1320 | TP_PROTO(struct wiphy *wiphy, u32 changed), | 1341 | TP_PROTO(struct wiphy *wiphy, u32 changed), |
1321 | TP_ARGS(wiphy, changed), | 1342 | TP_ARGS(wiphy, changed), |