summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiad Kaufman <liad.kaufman@intel.com>2017-08-05 10:44:29 +0200
committerJohannes Berg <johannes.berg@intel.com>2017-09-05 11:28:51 +0200
commitb44eebea181a36378bea8f27e7f9b4175bfad683 (patch)
tree540b50724da6aa1d72c0c175962c92607e54c51b
parentmac80211: shorten debug prints using ht_dbg() to avoid warning (diff)
downloadlinux-b44eebea181a36378bea8f27e7f9b4175bfad683.tar.xz
linux-b44eebea181a36378bea8f27e7f9b4175bfad683.zip
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>
-rw-r--r--net/mac80211/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 259698de569f..6aef6793d052 100644
--- 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,