aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ieee80211.h
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2011-08-12 23:01:00 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-22 14:46:00 -0400
commit8db098507c5cbe499061d0f6aea426a36e7c72d7 (patch)
treebf7062fff64f56ae376cb16ffa5c3cd85c09296b /include/linux/ieee80211.h
parent54ef656b05103f700ff8fc2aaf0382cfd0e54fe4 (diff)
mac80211: update mesh peering frame format
This patch updates the mesh peering frames to the format specified in the recently ratified 802.11s standard. Several changes took place to make this happen: - Change RX path to handle new self-protected frames - Add new Peering management IE - Remove old Peer Link IE - Remove old plink_action field in ieee80211_mgmt header These changes by themselves would either break peering, or work by coincidence, so squash them all into this patch. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/ieee80211.h')
-rw-r--r--include/linux/ieee80211.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 0750987f2a1..819954a607f 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -736,19 +736,6 @@ struct ieee80211_mgmt {
736 __le16 params; 736 __le16 params;
737 __le16 reason_code; 737 __le16 reason_code;
738 } __attribute__((packed)) delba; 738 } __attribute__((packed)) delba;
739 struct{
740 u8 action_code;
741 /* capab_info for open and confirm,
742 * reason for close
743 */
744 __le16 aux;
745 /* Followed in plink_confirm by status
746 * code, AID and supported rates,
747 * and directly by supported rates in
748 * plink_open and plink_close
749 */
750 u8 variable[0];
751 } __attribute__((packed)) plink_action;
752 struct { 739 struct {
753 u8 action_code; 740 u8 action_code;
754 u8 variable[0]; 741 u8 variable[0];
@@ -1200,11 +1187,6 @@ enum ieee80211_eid {
1200 WLAN_EID_MESH_ID = 114, 1187 WLAN_EID_MESH_ID = 114,
1201 WLAN_EID_LINK_METRIC_REPORT = 115, 1188 WLAN_EID_LINK_METRIC_REPORT = 115,
1202 WLAN_EID_CONGESTION_NOTIFICATION = 116, 1189 WLAN_EID_CONGESTION_NOTIFICATION = 116,
1203 /* Note that the Peer Link IE has been replaced with the similar
1204 * Peer Management IE. We will keep the former definition until mesh
1205 * code is changed to comply with latest 802.11s drafts.
1206 */
1207 WLAN_EID_PEER_LINK = 55, /* no longer in 802.11s drafts */
1208 WLAN_EID_PEER_MGMT = 117, 1190 WLAN_EID_PEER_MGMT = 117,
1209 WLAN_EID_CHAN_SWITCH_PARAM = 118, 1191 WLAN_EID_CHAN_SWITCH_PARAM = 118,
1210 WLAN_EID_MESH_AWAKE_WINDOW = 119, 1192 WLAN_EID_MESH_AWAKE_WINDOW = 119,