From patchwork Mon May 18 08:41:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hellermann X-Patchwork-Id: 473298 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 595FB14012C for ; Mon, 18 May 2015 18:42:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=the2masters.de header.i=@the2masters.de header.b=vq+nBgi6; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id B4F8028429D; Mon, 18 May 2015 10:40:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D5FCA28448D for ; Mon, 18 May 2015 10:40:20 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .the2masters. - helo: .mail-wi0-f179.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 18 May 2015 10:40:17 +0200 (CEST) Received: by wizk4 with SMTP id k4so69496360wiz.1 for ; Mon, 18 May 2015 01:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=the2masters.de; s=mail; h=from:to:cc:subject:date:message-id; bh=eitgd++JpR2tywfFNX5i7S0R3QBBv9Y0RAGyUAyUcbg=; b=vq+nBgi6xY7uTN8qyn9H5Jyy/5K2DeSQ6zoLBvmo0mfsPjjZjRkEnwQ3an7ClIeoeF ax1dqZOs5Pm45G0KqaJFYJGMLMt1Aq87x12hBq3Z/cETW2Dm7DrwkbBKHj4M+tgBBCm0 0Rfa+60gIfqwAki0EbU4IMORAoawdpjIwfsYM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eitgd++JpR2tywfFNX5i7S0R3QBBv9Y0RAGyUAyUcbg=; b=MxacvXRZMkglPhMc2Znz5BdXoWSXV7QpqsblMyFV/Og5nhvx+3syHTi6JEEM/9HHtD GNQgh78u5ifk/UIdsXkqkFRwr3+qfWfBfB7Iomoq2g1ywg8QtoVeruhFVwpM4g5SOX3b UUgOmvD/GqYdA3+02J2GOG6kb8zYEDLea/hgzqHgy0wxtSN0E+xgRgBUPSWrOao97xZD 4W9fTRmmk233aQKEuOc8acOmEZivTJwB++51pMp2/Cz2uaPhBa7s1oWZbDtk/Ge7uush kJ6BHZHcVvWeJXj5eE8MFXTOEH79BUFjc4t5pLKTuq4LYVnrog5DcdX6tFCUjNtu5ioa I6lQ== X-Gm-Message-State: ALoCoQk7PpIkgDX9lTZAsYwDEbcs1JLgKwvR8GbefAxTAyp0Ye+3C63Ab8amcwSFCkDexCSkXuiE X-Received: by 10.180.20.115 with SMTP id m19mr3916484wie.11.1431938497654; Mon, 18 May 2015 01:41:37 -0700 (PDT) Received: from devel.eslohe.lan (p579F553F.dip0.t-ipconnect.de. [87.159.85.63]) by mx.google.com with ESMTPSA id ch2sm11301043wib.18.2015.05.18.01.41.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 May 2015 01:41:36 -0700 (PDT) From: Stefan Hellermann To: openwrt-devel@lists.openwrt.org Date: Mon, 18 May 2015 10:41:18 +0200 Message-Id: <1431938478-9706-1-git-send-email-stefan@the2masters.de> X-Mailer: git-send-email 1.9.1 Subject: [OpenWrt-Devel] [PATCH] [PATCH] wpa-supplicant: add 802.11r client support X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 --- package/network/services/hostapd/files/netifd.sh | 7 ++++++- package/network/services/hostapd/files/wpa_supplicant-full.config | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh index 23d2e7e..a3ffd93 100644 --- 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 a9d04ab..26e3c80 100644 --- 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