From patchwork Wed Aug 15 10:32:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chi-Hsien Lin X-Patchwork-Id: 10566487 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 25AF817E1 for ; Wed, 15 Aug 2018 10:33:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1640628528 for ; Wed, 15 Aug 2018 10:33:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A97428555; Wed, 15 Aug 2018 10:33:12 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 3407F28538 for ; Wed, 15 Aug 2018 10:33:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729033AbeHONYp (ORCPT ); Wed, 15 Aug 2018 09:24:45 -0400 Received: from mail-eopbgr720123.outbound.protection.outlook.com ([40.107.72.123]:16697 "EHLO NAM05-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727141AbeHONYp (ORCPT ); Wed, 15 Aug 2018 09:24:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cycorp.onmicrosoft.com; s=selector1-cypress-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nbBdL6aMnTn5GbaH+3Ce/WOsPffOVF7Oz0RmYQvqeWY=; b=rYMZzOpt7CDZqUAV5Ntdx0lWlpCgphMgAT2F2tdI9n2nh/A7DQJ05vn/hPZIZUS5REmm8marwowPHFt/dqiXW0vsVdYwZ5irVZj/2SxbWLHV9un9z7izZSBxg7cGWggNB+PILz4ClCjfqh96h/4LEnhBDDmhQWlLuDv9Bpo1BJI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Chi-Hsien.Lin@cypress.com; Received: from aremote07.aus.cypress.com (12.110.209.245) by BY1PR0601MB1436.namprd06.prod.outlook.com (2a01:111:e400:522c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.25; Wed, 15 Aug 2018 10:33:03 +0000 From: Chi-Hsien Lin To: linux-wireless@vger.kernel.org Cc: brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, Arend van Spriel , Franky Lin , Hante Meuleman , Wright Feng , Kalle Valo , Chung-Hsien Hsu , Chi-Hsien Lin Subject: [PATCH 1/2] brcmfmac: add FT-based AKMs in brcmf_set_key_mgmt() for FT support Date: Wed, 15 Aug 2018 05:32:39 -0500 Message-Id: <1534329160-131774-2-git-send-email-chi-hsien.lin@cypress.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1534329160-131774-1-git-send-email-chi-hsien.lin@cypress.com> References: <1534329160-131774-1-git-send-email-chi-hsien.lin@cypress.com> MIME-Version: 1.0 X-Originating-IP: [12.110.209.245] X-ClientProxiedBy: BYAPR07CA0062.namprd07.prod.outlook.com (2603:10b6:a03:60::39) To BY1PR0601MB1436.namprd06.prod.outlook.com (2a01:111:e400:522c::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22d4fc7d-50c3-408e-0835-08d6029a7b9c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:BY1PR0601MB1436; X-Microsoft-Exchange-Diagnostics: 1;BY1PR0601MB1436;3:DSK5AEzihQSoOlMfmoIM0PA0lAwmomzLEX1s5F1gzdjQR2cjuGy9l0QS0zmiepPKSBoymOJ7xAHnzzn4LiHV7NDuIjjyE9KIkTvUgsEO1PYp74Tzot4Frq6/99MZLhkQZo0feSxhx65laXcZclEjOluh9RqTXok8dTr47aoTl1iZ6fQuvjGrkKaJxYGW/XTfDv4b1SJw7F7iUTmngjFV+wKD03CIQorcATjiokArZwk8fz1PgYEC/2P75pLyFwiT;25:QIUJKgBmeMleW8ZruWDcOoI0k7Z7CfMPDZ8RXlD/IebdyxYOWiitfIPdobaFuBx2MmuoymkNrbOyEcM9YfisYHOcUc/dlI1kqf7VawwQnvUVmw2arR5PCn3eH0ogfdY1b2mQkh1h0bmwvRHcif4ojqaNxwgBGLgLBt9jud9azik4I1kNbG353ffiwoeXSuBOBmUyum7UqMJ543RfvIv7Vfp4ADQRtQiXWjYyJlynhRAsxSb9JbLIRTQQY7LPA+o0tHgNRzwUbys1o3xJbItzGmgrpOQnAFXhUwi46O0DngSz3JGYgi+T7vCUJePQVONzWLUmavkG1Eq1dIHulgGOLHmShDqnrx0MB9+RSmzSyY0=;31:+kGbaQqHd+HzQpddhQXY5I9bkp7r5UyEoIsfV2fY3XjhQ9lNTvtZMsBP3zIgSeddr/ttCi7Z3jCye/9gLxfMxQ2Up7MVKtwdpu+y6jFLpk7uhj/0KU2TI2pe3jVpgV2krH5quiQJr3JrYyjkmjexFfskHRWOqb4Umzbf5pMOsGjNKHbb+qhqx5QqvWEuramZeI1qJADC2SPY6gWsv91qQL2DVk7e/mF3avR3+jBxIMM= X-MS-TrafficTypeDiagnostic: BY1PR0601MB1436: X-Microsoft-Exchange-Diagnostics: 1;BY1PR0601MB1436;20:FWkgIgldUj6KStPUFhLaEyGPTBAhxG6Gff3D3hh0gpnVKUnqON4/0zcSiT4052bNcN78K6PcgFIiWkkwFm63PhSm+aFhd8+BT+hdBwF9w8RKHgf6RrR7k/XodV8JuLP9jccYOmLfowmvrUTZV9DUhXwlfExINm0DceUllcDieKk0RiCqI5K9zXMdZ9UdkuwP4t9y+lnm6SFisHhBo4kU7JBb0GH17z9IEb/cjycSgCcH210LITsrorjUhye9F7bXPktkphjUYIxYPXwyDXIILxNgTAA3MPLaRYl4QP0VhnxIFTWXROu+FvMQZLaMUA3nZqpcbb4w6qVZOFwJQDWnMAu8UdiXlQ11f1+V8vfw8ENRrvvT0lTJKpCJvGumjhrXtOBZTKq2XdthyH40sXG0YghMHWrvIrVlh2tbM7m4E7siy1WVSGRR5XreJZj4ekd2owLvIn1jEBi62Ha0/u+mUhumCLE+KlTWkuh9G3ON0BFZyf0qMl/ib/UJiEwIiFIt;4:qWNiVzRfbKu1UBNuxlJyy1iow1kzKt288aLwUIGfdTIdgFK0+F1S6swZRCKx0GWZcMzlvKk2fMuooUQEFO4cmZulns3t+qw4aOYjzhWQN0U+qHQSDrDuotdFsvKDH1jz+AY7l1nGsuhtu39rPXOAtFRSxjmZQvolH/1vXnybZOcJjKgWlVXjsk4XYHRgzpZgwczxZLn0djyJ1kTUm2JboGtbmhun7yokO2kb0AZWGjWKsQziGLRcZzqFeiIGI4JnvS70N+0ncWxhA6x8PZluZTizDmusQ+22fs7NZMWwhOSClkX2xBbb/BrLL5KdpOWZ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(258095267146985); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301033)(10201501046)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011)(7699016);SRVR:BY1PR0601MB1436;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0601MB1436; X-Forefront-PRVS: 07658B8EA3 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(136003)(39860400002)(346002)(396003)(366004)(376002)(199004)(189003)(50226002)(86362001)(53936002)(68736007)(2361001)(305945005)(7736002)(72206003)(97736004)(105586002)(106356001)(2906002)(478600001)(2351001)(36756003)(5660300001)(186003)(16526019)(54906003)(26005)(11346002)(316002)(8676002)(2616005)(956004)(6916009)(25786009)(446003)(16586007)(4326008)(81166006)(81156014)(486006)(6486002)(52116002)(476003)(107886003)(6666003)(48376002)(7696005)(66066001)(51416003)(47776003)(50466002)(3846002)(76176011)(8936002)(386003)(6116002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR0601MB1436;H:aremote07.aus.cypress.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: cypress.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1;BY1PR0601MB1436;23:QwwUQ5bKOiUW91+WaszDdf5oVIeI7TP7YbI0dYbcIgKvAxvbmudLvH4RuJFBiX65U5nt0tj9LCCIpJRy0hVARdML7lmO6Xubg98dDficWYIRNKapH3cOZMKDkIg0Seh5/MNBBVL6GOZuUa/ur4YyBb6LdweiSOssQ7UqQv9TS+anvjwjOcqdLIJhfD6VXnt92v8jjJEqT0iesCCjCRSLzQajHzf0TPtqdboYF2DR5c/tvmGRaT5Inreh31OIwJ8ld67OwPW3j+aVjofCowQ2nwgXtNh+HgsQ/o6uXfFpEwX/yJFxw0EC0lXHhQ8lvLGKHEK4vPaHE8g1WmbgExrMQV/SHCGpLEzIrT6XUk29ugM5FPdj2ts/yfeSO1KLcPw7mfvM2S1Wl4j9+P4sV/h9yyvWsZFdMiUiYmPQ2Ep2xyZoFK+blIjFQ4mR/TQS0oqs7y4q9HXLPFTXdKUdeUSArjnJlIij+Mx6Vw3EHaA7aeg+EkYsgaD2A5osjwFuix3SM4dpaQSuuIjkGQGa1VOiPP6H4OHY11IvxdXsWeBKiZDDCrO+mqEul04LKG2P0GOAey8ck1yrX5nkY0oM0kho+usXUrBGBtFD34frZWA9ZAgz4gFze0/jtyfAlwH4B6+VSGsP1zYEb9qj95XaEbT2ya0Ax6ehMvvhPQAMTm4FpukoiunSa1iZ8AZlM8wHLAZj08PlUiPZVxFQ3r6UMUb9ZmUjaq7CYyItPksQELKh/V7a7vILcZ5LxE9dzJDtUA7xiwTkZC05fi/r/mFtcI9ZDf03r9EUrtyoiVrgO9P3guLsM7ztBhtoUhjQExLGEyxTZe/yztqlLhxRTmXohE8zOZZwQawTin4TM59Zm6J/PvfMLpRHg3ZGKSbhC8kejNsF/NyOPFw1VatQyVxq8JQjoJP3sD1LPvr4Gy5RPOM352YWvL+ZEyIV+d9M+hnw9ZuY6rxeuSyL0A0ALYjRL6QlqkChXTaOOIrFpAu0HcJ+pmn7ziIjR8XGYKEJOd8REACOdA8N4wv9IRR7KFKbw14cA5lXDNpO6/CP9LCjt3aW7OyzElW6p3H4cnumFOASD/leoPq3aUEcI0H8jDfuAlO5/IM/SqGlrTXCjVudQPTl5haNsu2935qJGCyIm96zJekF+kEFaE5N5fhMi8UD5d7Rlkk3Tcrn/K2Bu5EiW3w5gcwe9v1qFLPcreTmBLZT8/qacWckZR0qeHpPYAwEyW44QbViKmiIObmFYdn5484RYLU= X-Microsoft-Antispam-Message-Info: T4Yu6PJNsG8pntDCRDK91GeYrE1dXeMo5Z4xU1E8gNgHbhn6qgLTL/X3m+LhlM2pVf0+Qn5Jt5MJaeyRWPQIwyAnoEGQWQSFcc5/RtgcAlKa2cg2Pq9QvzZ4i+TCri7ODBGmeEed5Da943IKwZTbhIms5Zul+ZuA8PJ2MY/4Kmv15NSO2/HYDq+arkDpyGKtogbfqML0tsrVckahk+l6IfD7Dl7+dhRN0H9yNjGJ7ITs8jfoXwhJD96l/DOOf6L/RxoCueb9OjMx17nT0Glzp+cFmxoxArU2KXxHJpv2eDqLTgbPSAj1dzekJp94O80tLE0/XtNQmp2Q9CsMA8+9Ci/7/v0lI+6hCcYsrVFW0tI= X-Microsoft-Exchange-Diagnostics: 1;BY1PR0601MB1436;6:JijxWza0Y7/TTOKL6F9S405+0W8F7mvhdQM1g7hckyQYlGGt8VZLX/Bem/IrRy8R+f1m8MAB5UDzefSjVBJAe2kU5q/+c7NAtJdrbaxWWbtVCy3MfAXsnrgmQexexXDLH4+/AnAZNOfbBrD5h5yuxpcxn74CnukZNy+yNMb1gTjapVizZs/iRzBlNRVv8b1iQ8RV8NDK/ooTkSvDCOl7IESZ/ZTQM/hBin0CP1ijyiSFg34y1Rz2x9OKVkhm34ptSqPOuc1IvVc2FgRYYz++1bEVuwoR4ncY1H2DlJ3xSYInTIYGsDPsvEsDrt6F7FEIIL9Vwgw66jIexaqawCZ0R3saBOmgAFxEt8EVmVXXPqP4/rOn7YY+gr5H+kVpsrpzYXlFSmr1935W8OpJzoog8yNb1zhJfbJU3OBdn0WIxnx0bxCni4GLQXopwwcsGQvi4FqHLJApxwKYXKcbIwuLUg==;5:X7okQWqjQO85HtQs1XZf5TCoBjKVExAOM+27OpEnRnfeBbDNbx4XVzbfOaSgjCZKxakE+jTSZMYdBKlxvCI9Y1zZhaVQvna9YIw3sQaOQMTpS8AIUfe+F5Kgpam3p04JodWM5QVqhgE6Lit4yY7h1AYSmDf1lvnNutIFMv5vxCM=;7:rQT35k7H9XBiqitZ4rxZ/L3vk9QHX+jfh/qgKeaO2asevIS+1SjGv53j6PVOEjN4qyHiN9uvzH4Zt0y5R40WR/70FO5FDysXYvYetz6R6r6Ofk+NBv6rSB1/wGWIB4eSubR1U36l3TLCCK4NUmc4Kdk0y3S1dwWcS5RnfuI+beBjlOtY4fgyXb2IE/suyhjFVXOZyS9agpXjXiIPWEa6JtB8G6TG/YDYGvTkyvBeXMZUeh4tvHzSz0+xxnTkDl7X SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cypress.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2018 10:33:03.6077 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22d4fc7d-50c3-408e-0835-08d6029a7b9c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 011addfc-2c09-450d-8938-e0bbc2dd2376 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0601MB1436 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 From: Chung-Hsien Hsu 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 Signed-off-by: Chi-Hsien Lin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 ++++++ drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h | 1 + 2 files changed, 7 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 24c4e18e7d80..f56d76de0812 100644 --- 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 7b9a77981df1..91fca79e6158 100644 --- 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