From 3349e1092aedb5306eabddb4ff9001828a046622 Mon Sep 17 00:00:00 2001 From: Thomas Pedersen Date: Thu, 11 Aug 2011 19:35:14 -0700 Subject: [PATCH] --- yaml --- r: 265617 b: refs/heads/master c: 36c704fded53ee0d6866e8ae7f7e3d29cd4315b9 h: refs/heads/master i: 265615: f8fe10fcfa0cd2ea8c46bb4f1e5e9e97aa327a62 v: v3 --- [refs] | 2 +- trunk/include/linux/ieee80211.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index eba2183f4b9d..0eab24f10284 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8db098507c5cbe499061d0f6aea426a36e7c72d7 +refs/heads/master: 36c704fded53ee0d6866e8ae7f7e3d29cd4315b9 diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h index 819954a607f1..58033c146dd3 100644 --- a/trunk/include/linux/ieee80211.h +++ b/trunk/include/linux/ieee80211.h @@ -1307,6 +1307,21 @@ enum ieee80211_self_protected_actioncode { WLAN_SP_MGK_ACK = 5, }; +/* Mesh action codes */ +enum ieee80211_mesh_actioncode { + WLAN_MESH_ACTION_LINK_METRIC_REPORT, + WLAN_MESH_ACTION_HWMP_PATH_SELECTION, + WLAN_MESH_ACTION_GATE_ANNOUNCEMENT, + WLAN_MESH_ACTION_CONGESTION_CONTROL_NOTIFICATION, + WLAN_MESH_ACTION_MCCA_SETUP_REQUEST, + WLAN_MESH_ACTION_MCCA_SETUP_REPLY, + WLAN_MESH_ACTION_MCCA_ADVERTISEMENT_REQUEST, + WLAN_MESH_ACTION_MCCA_ADVERTISEMENT, + WLAN_MESH_ACTION_MCCA_TEARDOWN, + WLAN_MESH_ACTION_TBTT_ADJUSTMENT_REQUEST, + WLAN_MESH_ACTION_TBTT_ADJUSTMENT_RESPONSE, +}; + /* Security key length */ enum ieee80211_key_len { WLAN_KEY_LEN_WEP40 = 5,