From patchwork Tue Oct 25 22:44:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jouni Malinen X-Patchwork-Id: 9395661 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3037460234 for ; Tue, 25 Oct 2016 22:45:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 006162953C for ; Tue, 25 Oct 2016 22:45:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E91DF2955C; Tue, 25 Oct 2016 22:45:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B77A2953C for ; Tue, 25 Oct 2016 22:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754161AbcJYWpY (ORCPT ); Tue, 25 Oct 2016 18:45:24 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:26767 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754074AbcJYWpX (ORCPT ); Tue, 25 Oct 2016 18:45:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1477435523; x=1508971523; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=wDRyHTYY1VI6G9roGaEWAOmVEgisxsy34IHRU1E/VTs=; b=kt/qUChvmBgFdCyuvCUmNMCBgzykqd/ZnYlueSMjlyPvAzwpLJCnUEJ/ XPpeJVQQX+BDt8/qfXPXW5sDLKeASo2zh+Psud+cMXTq0glRqFJyJczpw 5Q9ZDdKWL3dKRYg3vPvM1i1KJZ+wvpTU70znCBzfWcmsVPU8f24W1l0Db s=; X-IronPort-AV: E=Sophos;i="5.31,399,1473145200"; d="scan'208";a="329939995" Received: from unknown (HELO Ironmsg04-R.qualcomm.com) ([10.53.140.108]) by wolverine02.qualcomm.com with ESMTP; 25 Oct 2016 15:45:14 -0700 X-IronPort-AV: E=McAfee;i="5700,7163,8329"; a="1298737028" Received: from nasanexm01a.na.qualcomm.com ([10.85.0.81]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 25 Oct 2016 15:45:13 -0700 Received: from euamsexm01e.eu.qualcomm.com (10.251.127.42) by nasanexm01a.na.qualcomm.com (10.85.0.81) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Tue, 25 Oct 2016 15:45:13 -0700 Received: from jouni.qca.qualcomm.com (10.80.80.8) by euamsexm01e.eu.qualcomm.com (10.251.127.42) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Wed, 26 Oct 2016 00:45:08 +0200 From: Jouni Malinen To: Johannes Berg CC: , Jouni Malinen Subject: [PATCH 6/8] mac80211: Add FILS auth alg mapping Date: Wed, 26 Oct 2016 01:44:47 +0300 Message-ID: <1477435489-8555-2-git-send-email-jouni@qca.qualcomm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477435489-8555-1-git-send-email-jouni@qca.qualcomm.com> References: <1477435489-8555-1-git-send-email-jouni@qca.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01C.na.qualcomm.com (10.85.0.83) To euamsexm01e.eu.qualcomm.com (10.251.127.42) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jouni Malinen --- net/mac80211/mlme.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index b6222f2..b815f2d 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2618,6 +2618,9 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, case WLAN_AUTH_LEAP: case WLAN_AUTH_FT: case WLAN_AUTH_SAE: + case WLAN_AUTH_FILS_SK: + case WLAN_AUTH_FILS_SK_PFS: + case WLAN_AUTH_FILS_PK: break; case WLAN_AUTH_SHARED_KEY: if (ifmgd->auth_data->expected_transaction != 4) { @@ -4479,6 +4482,15 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, case NL80211_AUTHTYPE_SAE: auth_alg = WLAN_AUTH_SAE; break; + case NL80211_AUTHTYPE_FILS_SK: + auth_alg = WLAN_AUTH_FILS_SK; + break; + case NL80211_AUTHTYPE_FILS_SK_PFS: + auth_alg = WLAN_AUTH_FILS_SK_PFS; + break; + case NL80211_AUTHTYPE_FILS_PK: + auth_alg = WLAN_AUTH_FILS_PK; + break; default: return -EOPNOTSUPP; }