From a0c38e5dd71fe42f4fa6e41431de645ab0b19f8d Mon Sep 17 00:00:00 2001
From: Avraham Stern <avraham.stern@intel.com>
Date: Mon, 15 Feb 2016 16:53:48 +0200
Subject: [PATCH] Re-order elements in (Re)Association Request frames

According to IEEE Std 802.11-2012, Table 8-22, RM Enabled Capabilities
element must come before the Extended Capabilities element.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
---
 wpa_supplicant/sme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index 068ded7d2..1c046a9ec 100644
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -456,6 +456,8 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
 	}
 #endif /* CONFIG_FST */
 
+	sme_auth_handle_rrm(wpa_s, bss);
+
 #ifdef CONFIG_MBO
 	mbo = wpa_bss_get_vendor_ie(bss, MBO_IE_VENDOR_TYPE);
 	if (mbo) {
@@ -498,8 +500,6 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
 		}
 	}
 
-	sme_auth_handle_rrm(wpa_s, bss);
-
 #ifdef CONFIG_MBO
 	if (mbo) {
 		int len;