mac80211: add MESH IE in the correct order

VHT MESH support was added, but the order of the IEs
wasn't enforced. Fix that.

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 259698de569ffa6a93c2738f85d6fd6af142eb9a..6aef6793d05236c19afe00a51f4ddc91bc060a39 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1436,7 +1436,7 @@ static int ieee80211_build_preq_ies_band(struct ieee80211_local *local,
                        WLAN_EID_SSID_LIST,
                        WLAN_EID_CHANNEL_USAGE,
                        WLAN_EID_INTERWORKING,
-                       /* mesh ID can't happen here */
+                       WLAN_EID_MESH_ID,
                        /* 60 GHz can't happen here right now */
                };
                noffset = ieee80211_ie_split(ie, ie_len,