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>

2 files changed, 2 insertions, 20 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 0750987f2a1d..819954a607f1 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -736,19 +736,6 @@ struct ieee80211_mgmt {
                                         __le16 params;
                                         __le16 reason_code;
                                 } __attribute__((packed)) delba;
-                                struct{
-                                        u8 action_code;
-                                        /* capab_info for open and confirm,
-                                         * reason for close
-                                         */
-                                        __le16 aux;
-                                        /* Followed in plink_confirm by status
-                                         * code, AID and supported rates,
-                                         * and directly by supported rates in
-                                         * plink_open and plink_close
-                                         */
-                                        u8 variable[0];
-                                } __attribute__((packed)) plink_action;
                                 struct {
                                         u8 action_code;
                                         u8 variable[0];
@@ -1200,11 +1187,6 @@ enum ieee80211_eid {
         WLAN_EID_MESH_ID = 114,
         WLAN_EID_LINK_METRIC_REPORT = 115,
         WLAN_EID_CONGESTION_NOTIFICATION = 116,
-        /* Note that the Peer Link IE has been replaced with the similar
-         * Peer Management IE.  We will keep the former definition until mesh
-         * code is changed to comply with latest 802.11s drafts.
-         */
-        WLAN_EID_PEER_LINK = 55,  /* no longer in 802.11s drafts */
         WLAN_EID_PEER_MGMT = 117,
         WLAN_EID_CHAN_SWITCH_PARAM = 118,
         WLAN_EID_MESH_AWAKE_WINDOW = 119,
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index d86a15d87e58..d29d11a31f5a 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2291,7 +2291,7 @@ struct ieee802_11_elems {
         struct ieee80211_ht_info *ht_info_elem;
         struct ieee80211_meshconf_ie *mesh_config;
         u8 *mesh_id;
-        u8 *peer_link;
+        u8 *peering;
         u8 *preq;
         u8 *prep;
         u8 *perr;
@@ -2318,7 +2318,7 @@ struct ieee802_11_elems {
         u8 wmm_info_len;
         u8 wmm_param_len;
         u8 mesh_id_len;
-        u8 peer_link_len;
+        u8 peering_len;
         u8 preq_len;
         u8 prep_len;
         u8 perr_len;