Message ID | 73a91a045e2dfa9d6e0bb5c23907449deba3701d.1527628707.git.peter.oh@bowerswilkins.com |
---|---|
State | Superseded |
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="tbE9ckof"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="bsYFPHqw"; 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 40wRTb65Dwz9ry1 for <incoming@patchwork.ozlabs.org>; Wed, 30 May 2018 07:20:35 +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=95mhOVfP1BHByOxtO+CJpU4XfKImJu8gq+KvYtNmbDE=; b=tbE9ckofUsOC07 4ONZdf3hwBpcY/SAU5znreEETfQB49WYphE7RnX/XjHXZUBxQnFgllNj8Tzwxw+lA6Lkwsh4HknRj 87gzbArQdoNGrZFIJtHWgic0Vx1Jr4kyYHwreXNgph91W3mNDrnC2/4EHBjo06k789cNLEmj7VBeT b2Np4C1CO8RlTgIcUTpSnyZE1zsMI7lWOhqW8cs4CYAvpEQaZnki6tTmKAEjjRaQTbAZiywVOwxL/ +v6HMMWgNq0eLBg+UE5IA50kI75dKBsdBaSqp2XK90d6ns3ESUxoUesxEOF8hk6fPE0Q0EcGHJ5to BcgdMYMkEm1I+6cn+idw==; 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 1fNm2d-0002it-7h; Tue, 29 May 2018 21:20:27 +0000 Received: from mail-eopbgr10054.outbound.protection.outlook.com ([40.107.1.54] helo=EUR02-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNm2F-0001JC-7R for hostap@lists.infradead.org; Tue, 29 May 2018 21:20:04 +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:X-MS-Exchange-SenderADCheck; bh=V0sSy30FEjltBtWDULmlIsDxtwDxSepzqVeUuWo0FKI=; b=bsYFPHqwUOjlBwykSSynW51KFdWZC/bfLbfuDFTdNNIuM/3KsB9EzF+Co/m6f7Zf2DCuGdvRy+xVXivLkxeNS8U3Vt58GaCuZPGdQLYzbGpqcNv8HaUFnt4ETuFAQCPS9xwtoL3EBX/yb0czALb3DdMlqU/l6Rpe67E9x9oK/rs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:bc83:1bef:7e2f:6957) by AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Tue, 29 May 2018 21:19:46 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v4 03/17] mesh: relocate RSN init function Date: Tue, 29 May 2018 14:19:03 -0700 Message-Id: <73a91a045e2dfa9d6e0bb5c23907449deba3701d.1527628707.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1527628707.git.peter.oh@bowerswilkins.com> References: <cover.1527628707.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:bc83:1bef:7e2f:6957] X-ClientProxiedBy: CO2PR05CA0101.namprd05.prod.outlook.com (2603:10b6:104:1::27) To AM4PR04MB1652.eurprd04.prod.outlook.com (2a01:111:e400:59e6::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:AM4PR04MB1652; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 3:NvGg43vQbGK0uodT6BUpY+IuOA5fy3Rq4i/h1b09mtq+no+ZNfCb1/T+uDRyt0tmle+ia9tBhlOvhdi8mzAytqDypAmVgM6Rvlf8LPQ/kJ0IUp8eCnzWNZn4ftcwuiJ0Z14DssCd0+aR9K8wcnbccY5QiVn79OZj5NYJmEUonzT8e9CEU0Af+FxYz/G7Hs6MeopbCkqpiBTedXQ1nXEpSpeDzTiLLVc5wc6FXmuRq0xfo2/OcwPzvW0aR3+Uvg2G; 25:/caNpe7ECPh8xWUkQBfyxcqzql/b8WkdVwi4KO9G5ymvohSmSmx5zqUnBDnoqAsOfTlIlrtxrKEi74FHt0rzK+hGEGUZyXIfgzJemjKYzhniOhXUMdwyYPVPJERRkujkXDHVdUYrN9TnYH7jRXURZWlqTOLy2GhnfzcAU/OYU4fHIw8PmfQue8aMiqUAuzSiHvW+u8vaFEjuaHcbcxH+Q2WqLRJjhj/HkM0MJE+eGLONnSSBkYeAPZQgh7Kr18jomPK653ERRhZFE3ZxUmIOILI74ENhUGV5e/2vB1vb2vCJYuJSu3Yqb971sIVZADsRxSMC3Im24NS2K57x2itl5w==; 31:NStnTcCR3PVIVUd39THGc0/LaRquc1fLMZd+zXMrzwyIBVNybdwYwvg3Z1Mj0l3jZduHFbR0Gt2ZCga3JRtVM18lLnT1m6e5jYB/70XaE4vrl49ATGSz4Sy+G/z+r0B0MWdHKvXObFc/lAnlBUweZQLFZHgcKk2hND89piL0Wo2KILw7/gCBSw5gQWXopVn3KL/U57KzE18Le6XTU35qzmjCWnsnbcv9d/9k7grnOBM= X-MS-TrafficTypeDiagnostic: AM4PR04MB1652: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 20:3JLsyE/SSil8ypAATSgPs5o14UDHQEjkp3Mv8KGVv0laREl0aJg3H/plYKjov76rJRxn4v7305KcbgybU00h3bQ5QbSRufwLNAVQWfHJhNbu6wBjf/UKlYCREAvUN4AeAteYwY306ST3aQbc5tmAFViteUgohWMn6xqqbEExEaZhBd1LDBMCF4YNqIbQPXmkcaw75ib2K7NgS7D4vS8wgtJ/794VfrE/HGxmGKeeWY6cbO6jrDiqZgJ8qKwD1oSuNUY/ove7mHv3uQgzuMPFNEyS4NEt5osGHLLt83J9aCQ1p3c2BXlzWkYr6thgbF7AYauoPNfRdrTxZ3RcJ12lC7NmtGkBcjp2INCcv3NY8sjcjekPMX/ujw//amc3RNnfbaALI1fRXZkjPn+tyrMiKK3lOp6OT2An+nBwnqnRkTE=; 4:H7r60te7Qh8vJ9Rm/l/QWZoyxdcrlZogiLVnq4Z91Stv+5DmYOcnA7oHHonLK/rKT7Q9zSuWiDEzmCz/uZBstHntqCUZkKSDhCUdt3prm1/WmNxeN5cD3M8CBTUEpCtVJPx8uP/ksxkVbTPRSpvlxUC6F/QkjHlXpVbcYau16dZl5qsJCb+9j9Ve8RoUlnBRKelo9or7ZyTVJuy8Nkp7SY94SE9akugZyjr3ctZaINV3ysEE69+oh6xstCWBzuKPtq+O1fhOBdQOmQsLefdHeg== X-Microsoft-Antispam-PRVS: <AM4PR04MB1652469B9C783059ECED95B7996D0@AM4PR04MB1652.eurprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM4PR04MB1652; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB1652; X-Forefront-PRVS: 0687389FB0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(366004)(396003)(39850400004)(39380400002)(199004)(189003)(11346002)(446003)(68736007)(51416003)(46003)(486006)(4326008)(2616005)(36756003)(69596002)(33896004)(2906002)(107886003)(6506007)(386003)(76176011)(52116002)(52396003)(85782001)(53936002)(6116002)(25786009)(2351001)(118296001)(2361001)(47776003)(9686003)(476003)(6512007)(8936002)(478600001)(81166006)(86362001)(8676002)(50226002)(50466002)(16810700005)(81156014)(316002)(97736004)(6666003)(106356001)(6916009)(186003)(16526019)(53416004)(6486002)(305945005)(7736002)(48376002)(16586007)(105586002)(5660300001)(3714002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB1652; 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; AM4PR04MB1652; 23:8QExGfK3wsugDzMc3paYHjIiqIYT1ZPDzKLiDtRtn?= 33Y3HQCd0yjpZkDGXgfgnXbt1Ok5/36RpyJWeFpzEMc4r1GN4WNUUnBNpwakpHZbMpNuzN3bYCt6FCYWiMhaZZtJm42XKuXgGwgyWXfmLRwQu5zezy81B38VoeiFYwD7APTGhCXV4UCRjX5jX6U/2FqhkKtpFqzECobTuO0f97x+wk6zTUICy2CXCNLo8Fu5nFcW9Axb4ONVwYXWzM+BbdxxelXqiW62dXLSW40tFZJC9aKEXHXN9srlaLtbxmWfi5zu8W2RR8Ee8aSFeQ8yojGjcnV8NFfpuWbiN0n2tJlqykbg3Qd6diTqCWe50Zj5Tci7msrfmyWQeQKxXkr41KQpIzbBSwoUCOCT9aG0cZltcl/2MBD5BGQTYmf4j6Sxyobvv95Y6Ms222DAIYeyPdK6tInxAg2jULGQvkYLdOdEHmUJg2iCFZIzuGvvv+Y4iMqULxnpW6r1gDTJ1YJCEfxjNaxefpmttcXysuzfsm0OG6TuHdcVvQS7zaE7RMFw1ANVbfi1riPEQSD27wPXcWWdU29Ar3Z5FxEb2wl8vpWnK9Lb47ATsV+bR6zKjrwFpT+K2dygToRPMelF5qsprb61Xg3IRdZKo6Xv583eRgnhWZQJHevb7njC92AFxZnDr9PbAbDWMwWeEJqhzdecpp11f5RYNve2rmoLcmfCmYAUOnd8PJNmHNZ482GG6A4m+nDXtdwUzbIqLapIvQYNrkDlVeOojSdNIuuozkpse7EMZWttY1m1IDWRg7fSk77S1hflq1GvlIEPrH6DpT7biEOsQWKK3L1Oh+WFI9EfSO+F4wYVLcxmByeN9S5eTaiy7o6wRc5txqhoutavJv6ClC9wTj90fWxkpbfPKW3WmWWsOpQ6Mf5xTzmIJAuexJef8TaUrf/SeftgNLRGACGukXOnkzjZ8SZSM6ePjNl4kQVSJoXqzVteAW9H8L0DKtvqtWfAeKIlpAXPSo+RnLinsbsbsZdABIIE8405twsCwRbq/ZvW9kQqMvkVdlob2zCczwdPWpdRonQm1Sp8Le8/lNvfcKrt7IfNY//kX7pUt/2Gy0wX3yyUWxYMkFKY9DdoKfEzHuVla2/ejD2pf3i4U8tSWN5OovRlPk3KrZDK3NXAlTGd07I9nTmSgdzYImQwpegrKPrg96Zeu6sDfHomYVxyWyW+FxSyYyN18l5CmrShangWiSdNeBplG4LjoFxS9Nqnbf9UanZ5h3Xl9EunkwDm9jC7Ywi1YBziy9GLwdFK/8jyxi4aSsiERdgNK4eI1EGAQnS8zrx1PH34nZwy3i4YxByUSoqaAdk6U+A5ElEMgO+jinwtZAkPa5ryb73woEkCBOp8QezZesSfis0Tn8h X-Microsoft-Antispam-Message-Info: 4OBkUHpB5ydC2cqOe/EgNtyL0z7YU8CnI3RSSEOm+j5XmAwy7a4kGlSNAOaEyvF5RbFjtrj7vLrBGNe64y0Sx5nruGkxG6q/a3qxz+/bh7kGuW5AypJvf7ehmg3qLDHCbm+rDw9i+05FP2C74f3covlAjUe7WNVQCseWj9gElQUCbmscFiJXTyonQXwdRyNw X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 6:sriO+HD5BUdvwY3HIwsFV2AIEXJSz2TKZFkQI3uJA7SkAAY01dHieDDPacks2b5nIVC/a9SVv86wm+xShHU/wli0fhK2v+3bctb4pNlfn1eNsWfppU9Z5D6X2b1DrG65yvHuBZCW/ef7xwBB4isL+TX2nkS5DkIjbO7+1lNdDuTiJYeOgQ2PCOSPXOoE6M+gCBp8pzIkiLYVsfK4oPeuzOXTsKHj8lgFNPq1HhnAwBd9uGfqEzzP6qLL2vofSzK1708eGZ6RqTJSji3o+OoETro8uLmiDQRT/LBN0mWpFvWugcHbQspk7+EZERu/eB0U0VaRcvkQNp7L5VGNrouHKAAwo1L4qkiwFd0W5vdHtE4qwgqLRPX5mBldV+Mu+5jBVoMZ4ol6RjYBsbPGh3lDiz76lSvZ1hkCnRSo1+mHItaDtUkeiUBXelVaa2TpVhge5yqDBAHhSzGH1w/crnh1Ng==; 5:AlHQBk8HKBdv2VOR2S7HMX1YdNXUZ9vnOy874BGJ/8/r/W+TDdHQZwSAh/gCEkUW8XXYlD0KpIAGQe1cNAe15iPILlAz5rOnFg4qWSKXUm4Nk/qdAWTM29IZuhFhgDouYchKr28/P0myrRwccugC/ub9cc3EFJQqWlgj104533c=; 24:8nKyY2U/kctU0LDYxG/SXZjOg9iIz/wCkWPIjE7cPleiivsj08GzgZfe2JbgMQRFz0P/jANSeGaqUcqnR+IGRvMgOC6NZUVCwZCYoXPIZd8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1652; 7:wrZO5nufziAmrv4C9oIYzusLuAPu5PDfpK4IitTOYC+ibK5BhVo7iKIlL1KRa/YITayYc/gfwAeT0+rYFo/tkhTEwUPkhTpCkDxGqU6wHqQ4wETc+rmu5ffW9G7JE3yQEw9rFAX0DvWm+jJvJMI8iVMhdblqB3gIT182ywY07zfw6bfAQi6Rv0wLYZp++UgXgPrUan0+6YwoGXyfYrf3AwC1p1xjmP6kZ4QrnWBVqYLRZEfQTIylHeAnwrlsEPve X-MS-Office365-Filtering-Correlation-Id: 6525b6c4-5f53-4b77-4e2e-08d5c5a9e7e9 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 21:19:46.6689 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6525b6c4-5f53-4b77-4e2e-08d5c5a9e7e9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB1652 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180529_142003_304640_E8C25A45 X-CRM114-Status: GOOD ( 12.52 ) 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 [40.107.1.54 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 9e46501..6a88149 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -336,9 +336,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; @@ -384,6 +381,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;