mac80211: simplify and clarify IE splitting

There's no need to split off IEs from the ones obtained
from userspace, if they were already split off, so for
example IEs that went before HT don't have to be listed
again to go before VHT. Simplify the code here so it's
clearer.

While at it, also clarify the comments regarding the DMG
(60 GHz) elements.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 7 insertions, 12 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 3b8e2709d8de..ee5ca1bc5a20 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -780,11 +780,12 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
                         WLAN_EID_SUPPORTED_REGULATORY_CLASSES,
                         WLAN_EID_HT_CAPABILITY,
                         WLAN_EID_BSS_COEX_2040,
+                        /* luckily this is almost always there */
                         WLAN_EID_EXT_CAPABILITY,
                         WLAN_EID_QOS_TRAFFIC_CAPA,
                         WLAN_EID_TIM_BCAST_REQ,
                         WLAN_EID_INTERWORKING,
-                        /* 60GHz doesn't happen right now */
+                        /* 60 GHz (Multi-band, DMG, MMS) can't happen */
                         WLAN_EID_VHT_CAPABILITY,
                         WLAN_EID_OPMODE_NOTIF,
                 };
@@ -811,22 +812,16 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
         /* if present, add any custom IEs that go before VHT */
         if (assoc_data->ie_len) {
                 static const u8 before_vht[] = {
-                        WLAN_EID_SSID,
-                        WLAN_EID_SUPP_RATES,
-                        WLAN_EID_EXT_SUPP_RATES,
-                        WLAN_EID_PWR_CAPABILITY,
-                        WLAN_EID_SUPPORTED_CHANNELS,
-                        WLAN_EID_RSN,
-                        WLAN_EID_QOS_CAPA,
-                        WLAN_EID_RRM_ENABLED_CAPABILITIES,
-                        WLAN_EID_MOBILITY_DOMAIN,
-                        WLAN_EID_SUPPORTED_REGULATORY_CLASSES,
-                        WLAN_EID_HT_CAPABILITY,
+                        /*
+                         * no need to list the ones split off before HT
+                         * or generated here
+                         */
                         WLAN_EID_BSS_COEX_2040,
                         WLAN_EID_EXT_CAPABILITY,
                         WLAN_EID_QOS_TRAFFIC_CAPA,
                         WLAN_EID_TIM_BCAST_REQ,
                         WLAN_EID_INTERWORKING,
+                        /* 60 GHz (Multi-band, DMG, MMS) can't happen */
                 };
 
                 /* RIC already taken above, so no need to handle here anymore */