Message ID | fce10086dfde730e64d53b81d9fcd1a961eb673c.1523526306.git.peter.oh@bowerswilkins.com |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bowerswilkins.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gOYYQE/U"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="EYNZQyXi"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40MGP51FDYz9s1R for <incoming@patchwork.ozlabs.org>; Thu, 12 Apr 2018 19:50:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TLBaCK1wmTMm1hB8RH+bWVU21Ak4FGP/A0HuWB7QKYA=; b=gOYYQE/UsjGDxV SyUS4aDpF1KCdHUlopPYW7kn64IRTEeXzauLusmPP3Ecq1baK+ngrqtS0FjUIE+3xvZWbmvcJ1cn2 q1Go/esxW7IaU8DSABsLszDlkPcicBOeBWTNbN4lQSakx1+MvQ7UxCd4UVfQViolA982VDVeSEqrE k5iQdQtQWT5BAse+s9+3hV24Eppw29FPqwrVhNTg67ITHhCtOF0QNUEmqzOJox9JYzZbJ4uBkUzJL Aqd9qSxTigyZIzLdN27YBuhOv3RHz3bt69rDw6tiudbbGaw7MttwJm0f17deK3eKbNnrAR12lpEmz gWJoaWAItaGNMFV8g6ZA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6Ys9-00061M-D3; Thu, 12 Apr 2018 09:50:29 +0000 Received: from mail-ve1eur01on0082.outbound.protection.outlook.com ([104.47.1.82] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6YrX-0004Or-0q for hostap@lists.infradead.org; Thu, 12 Apr 2018 09:49:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=hkBYaaReTyAwaeIyPKCxEPBJ6aVqOGD0XJWyaaiHs4w=; b=EYNZQyXi/HyXSfjiSqEO1uHQpsRaRh+V0/WWdk6ydyG7AuS4rTRsBgfaF1HJ2LqPYxtnMNERUBeCYEdYt8IbgONv+YszRSpC7YYBGpTdukum+MTdFlNVEcOcAxeMvTxzKDhP8eEHHDs8tySvGfeOQDWBPcTdHqb7RQqBFS2Yy4Y= Received: from smtp.office365.com (2001:1900:2200:85:7904:f0a9:f202:eb99) by HE1PR04MB1660.eurprd04.prod.outlook.com (2a01:111:e400:59aa::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.653.12; Thu, 12 Apr 2018 09:49:37 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v2 03/15] mesh: relocate RSN init function Date: Thu, 12 Apr 2018 02:49:00 -0700 Message-Id: <fce10086dfde730e64d53b81d9fcd1a961eb673c.1523526306.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1523526306.git.peter.oh@bowerswilkins.com> References: <cover.1523526306.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:7904:f0a9:f202:eb99] X-ClientProxiedBy: CO2PR18CA0065.namprd18.prod.outlook.com (2603:10b6:104:2::33) To HE1PR04MB1660.eurprd04.prod.outlook.com (2a01:111:e400:59aa::14) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR04MB1660; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 3:eWB4sZnyZu8vnUpZQOi1TFVWaSB4rUPHjc6aLTOk65nUf8NNiaX7J7nycYCZ1wQBjQrGlgsz40i8dIuppHdJpEr6MyA0LsYAvHwB2AMzaiYz0ZX7iMuUaoEibYH/i2UTq/aNJXAy321fQK72Iae5l72aCrj3NFoxPttkuPh2vYEH3erDa3p/XRHGCMklcth/F9gVeLi7VYDSBqbuane/irnqG8eOOv0PxwuYWjbsv+cNyccpKoh9h9i0leIVCnTX; 25:M6LiUyOjVPzyOA42EU93Sq89ipQ11ADM0EKnp9OQrtfyxDt7pIfB4mX0ddlUXL+KBdhIVsFQvAqg2Xv3YA7s9W8BJelnzded1/kQQhAwkSi92YDvbKAwAZCB6dEiujNd5TQrxA5UXkNzesLDfwUysQimJc0b919bRsTIc5X2aYPiQyYqckjBvZ2MG/4KPqTVLhwf4eBKD6+OvOrnU1voQagP8tv7Gx2bYubkc1srKCKkzezHLyc2k3AUnEETFxYqcuS0lVhWKakbRbAAeVvhLt8pegZvtP2smRFvOByPPKrpSmlod66/bABhwZFYQHeLNfK4cNgoDuHds9Fntc/Hzw==; 31:cqo0SDM9Vm7yT6t0X4mXrfLJ5jWum5gossFID8JkM4hkBN+Q69abeuKW4EW76eIhcL61hgShD/v++YPjGqMECRvgNsk/xLxXjsc2ms/yoJvu+umx5mqMJjf0+d/7LjCIvuc3WGoGivm6J8xVjUdreiTbeR0yi/xuZHDk3GT6kqa3AQLP/rt4l1AdkXXPfKGCRiwbdWtcAkK3IeRr8nmufum8zOUflfFlygY6ShMMuvQ= X-MS-TrafficTypeDiagnostic: HE1PR04MB1660: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 20:V/8AyEh9ca9K9VqTO2tuvcnxvyGKoEbIGAPcCZRonLXW35gQfAIFmV6A4JF6zrC6U5CcQu2xGZhUdy66P1ghkejYJBFlP7feAr5pkFKE97Z0KllOFF14017VPKwRICKsP3Lvx7WcfVlAYCbyDEei+Y8taVY6p8aFB0J13ZFgPAGeiqLQQGpBjUUC3NBf7fQ/n1G7i5MWPx/sjLgFBKJbAJUP3auchOrtB456TGa8EpqYVKxv3faZAw63Z7ROFN3k2NKMAnzGP20PTTFuU1vunp/7rRCDcePq0fun5jsI7zMdSE9zUgMwPHoRVPj78i9q/TjRZ2y0h5EM1ywuP2ittg==; 4:yr4m5Y8X6zWHdCN0sTcgT/cxHzqcd8aJVqFSKKSVHWEFF5gW1HkhlQiqJHZ1rXOPgMeb1eV6nXek4bVyT2bMAeQtsPzxdR97C3OKgEb1rCnFMjNjlFPGFkkloD2q9x0QYBcqyqz7i3Jn0bNtEJ9KGdhaZWb5IZHSfVKY0Gatbat6ZgpsZae2bu5Fp82+T+DRt1o9kdVCyxOxldwz1eOSAvhJMidpfVav5hERu0lO4G/ztsx3C4o6xhCFKNvbF/cjK2BjUx0iAAu1Z8tIv2SVfw== X-Microsoft-Antispam-PRVS: <HE1PR04MB1660C83BA1289D9D5338971599BC0@HE1PR04MB1660.eurprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(3002001)(10201501046)(6041310)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR04MB1660; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1660; X-Forefront-PRVS: 06400060E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39380400002)(376002)(366004)(346002)(39850400004)(199004)(189003)(8936002)(16526019)(50466002)(85782001)(446003)(186003)(81156014)(46003)(8676002)(69596002)(476003)(2616005)(486006)(81166006)(6666003)(48376002)(118296001)(47776003)(50226002)(575784001)(86362001)(6916009)(11346002)(68736007)(16586007)(6116002)(2361001)(2351001)(6486002)(316002)(106356001)(97736004)(105586002)(53416004)(33896004)(76176011)(51416003)(4326008)(386003)(305945005)(107886003)(25786009)(9686003)(7736002)(52396003)(16810700005)(53936002)(2906002)(6512007)(5660300001)(52116002)(478600001)(6506007)(36756003)(3714002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1660; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR04MB1660; 23:bGy8iHr2P6PVQqspXA65V60a5OgcxZYoQEu6kCTKk?= Yid1kDXyEKDs7cL1rykQ+3ltPwU0HvXo+aBqPTE2ewQrstCCzSzDbvocxuv5sRflQWa7gJYqzeG+YU0NcSWADVuQ/A8Ky+s6HrBIBU8ocKif1ve8lv1Pz81wKO/GDbdiOq0OQfoLqsQy87SgFAmW+UFoRzaus35RvnnciTeewEV2Estg5a+bSzVOlipQWF6ZVlEmWnbTjXQPNEjvUfRxFsnRmGO543M55hX7Yc508RI6s8CppUrEucWY8Cql+AubyH97HGf4QP2LDNVBmLi3NLY6vbc5A309q9mUjU8c+AGkWf1BowoMS7fltsIbJPSi+J1/jOWDlC32WpT5wTEbamn0UGhvV2BvFiVgy9YHCO38FTckguNolNq4l0qFYs3SZZ8a+qxf6IQUxevbsPA0vu60wTd+QjD1Hifns621iaIrogDKlPMc1iwdTkWX9UeGfJPdfHWq1ge4dHDf1qh5imqxoCRW/rrh0J+fqJlR6uQSB9BltLwoWN+aeaePL5wSubQpS/qphZZn0MebtE1zLUyy4aZ24FINEtenSoSmmMQoWRsF7veK1TkHornNL+TaSuErRD6E3lKSnyZKoXY6dNZU089PFmcoTOfjp1WJuWq5ijaxW3vSVy+n0t6k3F6F7c21pJTs0RzJby8ASdKrpFG2dPaXmDTTFgtLanlvln7VESY2k6DwprqWrcfJhn7+kf/dfMbaKJSOhLYUlobynix+nNVIm0a6eZ+yvfAiug1KMXPqXYSoq/AFRfeTt2YwYJGS22cRWG9yoxq5dE+f9ofsknsABPcaSVikJAfTxsO6RuCQgtrg8Z/PAhR8oukIumSUDlysqCAo3b48Zwvz4dxVxWyra0htFvjCEUd5ibp94OuBUt4SdbugKkUqo6szFr0+rlINUpnixtkV3IpY2XZWPo2EqNYW6c8fJEyofZqeVV49CjMfEUhqNQ2GglDmbyBMBnWcX9s9JPC3yA45Hyj2cqsIhij3G5zhc3EXOO6FCKRh7E93TrUjEQo5YtgjN61skKah21Qoq/IzoQol0KFHFrFSLI8Ot/Whyc61V0GYaXmB2dcyDnupI8mSKEvgIb7WctpT6UUicUBFVb0rljYVUCzX/vaZZqvff7ltODVQbgmSx1L9enYbyWhK9MAM7ACEGNXNmVcL3BY6eNvTw6MStgPpqoSfk4ryArf1ZVSn7WctcVQssHOnx7Mj2G1gRMIj5tkbRUs5A5XMQs03mrT8Hiq/lgh/KlJjWGgPitd1pq5/FGZhyjfZNZ99IwUNVldxq8xk5JyPlbbXVVguEI75BNSaKfLWsmibpmoZFdXlsxGclsgtnulaHOMYTmXALHZPPtFV6gG/2SswSdcMCctGi51DZH+bpCONxv+tchdjg== X-Microsoft-Antispam-Message-Info: ZTMPBKUYoOteVRbx7K0lnaWwkagA7r0n9sSqKWBfWRHWNFxh+1y1V+1VNQKKKVNQa4m0ahiGTFhX7c2IR0feAWDmVtpGeDx7evusU+LAt4Vky+wBbTct7Jyj1u6neE9LSOgQe1/6WqlIDf+wNZX7hAyekYyqfXF4emEXbtHKYeDUgHe0Ipg+V5Uhj7c/to8f X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 6:RoA9maD+iMUQ1yDJ19aij5W3L6vlQys8Szfz8IuwggfEtOCVsPLmcTmjZDNUFvA4uxlyIgBIrjEb7kEy5p+6WGHC38tuMK+TpKLvpLtcpUPvtbqdM3JlErGKJHBCVhBDl4EWHvcsdnXNbaTTCXq20W6Br+Qk1u81EXeNf9rPLmXlNP2h4g22RPIyS3SDp7iRjQvX9tb3EgD+22AA6XflSi7l7TNWJ+h+IitGSgIfNo4DIIx5IpYExvFN/mOPNO8+ESYmcWsxqdH35zcRvOvktv9NrDdnfFIZoHyG3MsnYiASol04Oxyvga4w/NEmyIpd7eT2foHWF/JjCAqXrslvyBl0Zde0r1T8qCLUX1Ktp38IznhDEOGnjoypPXUAovKfkf6m+Oqgj9QT+FDAZPYqG8OgxkrgtqEho5R+oiXKnbb20QbEYXzS/xmkmsuGO7CYFrwMFw8dsJyTkCcYtGWG8g==; 5:jATLbqJ/N1OqY+Lb2R9rLhWW52ms1KLrwT5fPH/zBLPktfCjf0zBRg7ZhBI65MUJci56k91eeYdm/Byg3w4yNfXeonQKgCPSnWMl+hqtEMacVIyiEpovGtHRI5SbM9GU5pruDCXIrksU37T6gvKPAx/uodYPse+/C81ubMTtIKQ=; 24:dschLus3elV1MOCdiYidGoNBUCG78hc0mpc2CEXk8E3wtmp7L0nCvzOskYrPhe/Zu+iDnAbF9uVefpkYf/5m3Jt8zSOCr9SKegEy57dUB+w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1660; 7:IF95ijCGRxo9TLE6YBCfkOpPrdvnnwBnTMJi1CXBEyTvLaOpKI1195ZIIqddFvSa/wIOniKJLsnn03ynvWofX0IZPYVS2ieflMB1g1nthZjIsg/5wHWluYnae9RqKtznsrIrrhmmBFTKpa5zcnsw1e28dUOd2ucRfJ8z1GBQKfRNmCVrDF31E4Q0hPo2xhp5V8wnMq8NIfpSRdj+d/Jdzx97XmbxsecgfzWaATTZHHJTb69liysfU+g8zNHP3to/ X-MS-Office365-Filtering-Correlation-Id: 56d8712c-6194-430e-4243-08d5a05ab4db X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2018 09:49:37.6592 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56d8712c-6194-430e-4243-08d5a05ab4db X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1660 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180412_024951_110958_508F80C1 X-CRM114-Status: GOOD ( 11.12 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.1.82 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: Peter Oh <peter.oh@bowerswilkins.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
mesh: enable DFS channels in mesh mode
|
expand
|
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 8e0d5ebff..88001a1bd 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -333,9 +333,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (wpas_mesh_init_rsn(wpa_s)) - goto out_free; - wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); return 0; @@ -381,6 +378,12 @@ void wpas_join_mesh(struct wpa_supplicant *wpa_s) struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; + if (wpas_mesh_init_rsn(wpa_s)) { + wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh..."); + wpa_supplicant_mesh_deinit(wpa_s); + return; + } + if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher; wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher;