brcmfmac: add FT-based AKMs in brcmf_set_key_mgmt() for FT support

Add WLAN_AKM_SUITE_FT_8021X and WLAN_AKM_SUITE_FT_PSK in
brcmf_set_key_mgmt() for FT support.

Signed-off-by: Chung-Hsien Hsu <stanley.hsu@cypress.com>
Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 5444e6213d4592e6ac35dd1889c82e4a8d62db97..c40015d5a51a96868ed81d3436759848f3e16f88 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -1649,6 +1649,12 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)
                case WLAN_AKM_SUITE_PSK:
                        val = WPA2_AUTH_PSK;
                        break;
+               case WLAN_AKM_SUITE_FT_8021X:
+                       val = WPA2_AUTH_UNSPECIFIED | WPA2_AUTH_FT;
+                       break;
+               case WLAN_AKM_SUITE_FT_PSK:
+                       val = WPA2_AUTH_PSK | WPA2_AUTH_FT;
+                       break;
                default:
                        brcmf_err("invalid cipher group (%d)\n",
                                  sme->crypto.cipher_group);

diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
index 7b9a77981df16bd7f78dbb7ef2abdf2b1dfedf8c..91fca79e615837d808689c947a3d022bf25e983f 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
@@ -237,6 +237,7 @@ static inline bool ac_bitmap_tst(u8 bitmap, int prec)
 #define WPA2_AUTH_RESERVED4    0x0400
 #define WPA2_AUTH_RESERVED5    0x0800
 #define WPA2_AUTH_1X_SHA256    0x1000  /* 1X with SHA256 key derivation */
+#define WPA2_AUTH_FT           0x4000  /* Fast BSS Transition */
 #define WPA2_AUTH_PSK_SHA256   0x8000  /* PSK with SHA256 key derivation */
 
 #define DOT11_DEFAULT_RTS_LEN          2347