wpa-supplicant: add 802.11r client support

Add 802.11r client support to wpa_supplicant. It's only enabled in
wpa_supplicant-full. hostapd gained 802.11r support in commit r45051.

Tested on a TP-Link TL-WR710N sta psk client with two 802.11r enabled
openwrt accesspoints (TP-Link TL-WDR3600).

Signed-off-by: Stefan Hellermann <stefan@the2masters.de>
SVN-Revision: 46377

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 23d2e7e83ebe5ca744f40e300fdbfb1014c555c5..a3ffd9395475c91f764e532379ab9a741c55e7b7 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -538,7 +538,9 @@ wpa_supplicant_add_network() {
        json_get_vars \
                ssid bssid key \
                basic_rate mcast_rate \
-               ieee80211w
+               ieee80211w ieee80211r
+
+       set_default ieee80211r 0
 
        local key_mgmt='NONE'
        local enc_str=
@@ -549,6 +551,8 @@ wpa_supplicant_add_network() {
        local scan_ssid="scan_ssid=1"
        local freq
 
+       [ "$ieee80211r" -gt 0 ] && wpa_key_mgmt="FT-PSK $wpa_key_mgmt"
+
        [[ "$_w_mode" = "adhoc" ]] && {
                append network_data "mode=1" "$N$T"
                [ -n "$channel" ] && {
@@ -594,6 +598,7 @@ wpa_supplicant_add_network() {
                ;;
                eap)
                        key_mgmt='WPA-EAP'
+                       [ "$ieee80211r" -gt 0 ] && key_mgmt="FT-EAP $key_mgmt"
 
                        json_get_vars eap_type identity ca_cert
                        [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"

diff --git a/package/network/services/hostapd/files/wpa_supplicant-full.config b/package/network/services/hostapd/files/wpa_supplicant-full.config
index a9d04ab1752bf8cd8a51d5d4a7cb0431463add57..26e3c80aeea006a77fefbb3dd0f06232643b1485 100644 (file)
--- a/package/network/services/hostapd/files/wpa_supplicant-full.config
+++ b/package/network/services/hostapd/files/wpa_supplicant-full.config
@@ -367,7 +367,7 @@ CONFIG_INTERNAL_LIBTOMMATH_FAST=y
 #CONFIG_DYNAMIC_EAP_METHODS=y
 
 # IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
+CONFIG_IEEE80211R=y
 
 # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
 #CONFIG_DEBUG_FILE=y