From patchwork Mon Aug 27 21:28:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962647 Return-Path: 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=) 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="SZ961dqK"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="B9dMX5g6"; 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 41zlS10czyz9s4V for ; Tue, 28 Aug 2018 07:30:57 +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=Qy8LqqJG/UsqumknaOKo6q329zdvt1OCO6jYjjw/NIs=; b=SZ961dqKoUBKxS 4WaPhqivW3qYuMjrmdjUx839Pqhdw/fFuyMbBAZpsWXuWx7aFtEIYmpYsnL/xoRGqIqoLpjFjA8NU SaIRZfQNyQgIHCHiHvhTRMkO7W+vuIa7x1x62ukgFsJOy4SdDFIl1Rtu6O55FK6jH8o+8qhfIeRtz VRSAIihDnxqVCfl+XFmatnP26FXzJ/6trnzD39ny7KLeDNuAALDs5/Bd2KEpMucfOkhbe39j+MCxO r2s69OLvdPMKndspcPVjJ48NRBr7/XyUZGokEctyJsDgi28dKjfuCniO2zak+9F1AyffnCnAK7+F4 5phao5gWS6Z1TzYQdGmg==; 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 1fuP5q-0008K5-S5; Mon, 27 Aug 2018 21:30:38 +0000 Received: from mail-eopbgr50084.outbound.protection.outlook.com ([40.107.5.84] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4b-0006Rg-O7 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:24 +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=7zVKfePe5BGHCBQnwq10XLTZBn04ziGZIdoFDiAP904=; b=B9dMX5g6wZ3XpW1/CWnIFLFxQCGMCXghts5W1fiovzkGpAxuX0+qzTzazg04n0GsxhHajzcfO/RiVHXfEyRG9S7joL3OEBhUvoL1P3HR4vRt4HJx/4crkEAo+RXDhg1ViZ3xdOFzUFSzMn4Mv9dAm4hgRo+ahyxpPWArSEnTdzo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:01 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 01/16] mesh: factor out mesh join function Date: Mon, 27 Aug 2018 14:28:34 -0700 Message-Id: <8222a60e4ec6f0f75801ac3742d722e5a3f3676c.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 235007b6-9dbf-4822-ead8-08d60c641b94 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:HT8eczfnkyoZfjWFm5GqAZqWbu8PFBUc2WwiADxsdyBpT3vxNLpMvQ5vdL28sFj9lK8CeHh2dZyDhqntR4gDWB84QER6lRVf6QAgvjkWxsSMLx+c272V98XRUJcBLhzpV0uOdj3U93O+P+zp1bCXNTc07wtTAEcDAZinYL0fQXVGXygbYlL0TZhP2gNDezsV55OgSgG9OHkPGbCA9SbbJWe7PGQd8FON45BWYNG7noXAr/IUgqrLEHOq7/vSOY87; 25:f8EZ69bmXGfpC2HsAixl77q3ueTGJaNfheZ5hKhBfBesjTb42qWIt7/hj0fijyFE+axUaIALj7KtcwCQw2jgXc0wWTpOcUf6Z6AYDXpZoWzcYJvGPVvX6U8t/328bZvqFr55XFI0Rd90cUOnTHeoxvnyNof8SmiA6KZ5Z1LjY1YCWxpIBGgJujDTrC++yFLRxiBco/bqbHwtv+Gw5xkJBilTfDp3FTyuvbrIoJp9Vrg3dd/Ktsm+3kohANm6hF4N+6YxTJB/8XYhUt9zY0XvKFMFcZHTXOKZF+YzR6THH+hRgFvyTBzr/8lcO9nkhn/DBC27p16tEaytk66VddRsIw==; 31:wgDpTUhRy4mqQ3tHiwHs6BNHIIOyauYgIeThqpaMM0DcFaA1GSOa+GM6pZmkwRpyM+DDOOkKqncUQqJkCUcVCYjxLYQHiaNr7DSfzYB5KHvlj9vJ3CucFuQx08YrYQmj61Cceo4shenysbJH0GlagKHi0MIf12IdniTFodJfAmGJWr93eD8ZjLHpUg20UqQQIAZGkpozmAeV6OgWPTQBcvdPWihwfQQ8gNXor+G7cjs= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:UQlhk2M2adNWV8tsesRcpengRSoA8fUVwDbYjBUZZ1WGAvIEcUVLp+dYi5h+/0pcifxnGlearcZCCWg15YHA4oql+W3zOpuECLGp3Gj+CV3w6oWruuyTApl+lFWAKmN/g6PWxEufK4eRUmrJZIP5VOvhFHlOYk11R5y6mbSyeUN/nPraifrix55jb9NM4wljleTmED1AnDmMgDfIm4O7QolfwATLVY0RaMFJFhI2zZPqb/ADJsvq83Nr3uMauhouYnsuXdjlMNGb3psRBDxOv3CtSK3Skm21W13J7B809F2cgnLXbl2Msmqc/gWJ7yRUMg6rF4OeX8yNtB0uL+qrPFnFrHKsLY0c1KG+eZayGzJUYy0xTh+8iCODKRe3tpVGI44VGAhnaP115cMf+MohI0f490a1bIoBBgoHi+wPHFK8OYdKh63VvKPS4SRWfpJU1oacX+3j9xHr5KBPabMWj81OVYHBVlgYGZnAYBgfnSFeakF99kFOsvMX21BSXra0; 4:OJg7KI0OGU9qbPX2cyPAfvzY1ftAaSckBX9SYjZ0WnOKXYPkKzVm8N8ZwszyxACk0o4AtxE6BmLYf4LsQz7nW+DbqQlViUXW6zkR1SnO92cFe76TY6fTuMoJlnm/BvBvudmfW/p5N5awY+udfDOJLYd/zFL7HewDjMv5GsXPh8gKGCzU9cl+LETQ2m/c3dpI9lxtFSa50j2qOsoVpiR+Q700NUdQJyZIz3dOTq3fS4S7PtI6ZpbG9SVY9ujt+9nCwNgV+s8mg8l4T8HqF7TFmg== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(52314003)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:F2GCzyTeNDKioy3DhcgbLM0db/Z+39bhddZODhYxW?= el+7VYjq3jyv616K2V4KEXxThs7hQbBg2IlX5ivOM97yA75c90ZbaPGmGKH5UN1MPHtHA9WOvJ9hVWk1CMSvHlVbUkavmVolw/D2CtrG1lHQhRcxsfjsd12R0pcs1XPtC/HCXtN2jtIbIIPLqOpf39RGYaTgKodIEfd+sFYTrX7Y2G6uli0cIXZcx+sjSKWZpovM8wczpXr4QSy4JnOGKnGLj8PFGfsj9yJYnNEOxAQz/AOyMoo65FYbbBpzmxwbOToE/yXi7XhFXTfFj6VlPVuJCymZUkduNbzNw7Db0alf5axIBzy7WKb8r1+elrP9uxA2jnr4wkJcrtka1LjgMrVCU9DjDxuFdVY8QzJiLpnNzD3E9UDr51JLpxR9UT1RRGVGx7Cue2r31D/uDldkZPWvICTcUZsF6RjG+sOuSTl5J/XD0vVYfwXLwtcvuMdUd3YyY+82Qdj9oWuIwke5jScR3TIkLzItOVM22bxFKNcmHmTy5xcw9hBz9LpBdP+F0OA9JH2Vc/syyBQh6M2VQKQT0nl9pFcnGfIcZEL9DL7C/95H6rXDreCFuwqnPv//vy9VINKI7x45Q4he//GwllZ474dDo/rJD5CbPvdqKmKC95kuXMqDv2Cf9jeoo9r4eztptOHrmZk6nD3k+u+nwzeUvCFyHoQyec0ewexTIdUJkfYAsAlfsLu5dgdyPAETNpQ0GjHSI8heCcMNCPtLQ6HoRXREoNkhL4N0APcfab6Vxctl3wmHsRca6zz/Kq54Sja6mFpNTzpUZMCQZH658pF1ZnKwGztYSMCMdzGbjCSzZ8vsk+aod8KfBYfgSatfqUeMlQQ51zBOMj9gjlID2XdQlZgXjZX10kzxcxKcQ0C7TlS67Px444g9Y3AMwUl8JZvikqvH4ij5Up/Oy3L/4qvqyv5en5WyU9eT4xRbiZwhk3RoghZhKjw8BvO4Kx6fljIwsYQbZBljMXec9UxUMujfd7CkpM1ra13VT9JMuVj7Yf4P50pYqYk8D4KJKVpWCcie4dg/c7u/k+8JtfubrE39UWe9sT+TkdIeizkFIFBvXb2zo00b9nO+A7N/6/GL1vIUDC0zDmEdV1RHFeNk3TCVRvBrkNA5kQRrVWSb2SilN+jyXduTVZ+8IPmWaG8re3Tqr6GeTBYhVDK7A6nOcL1xh4MqtSW9+CVbc+AcZN1MLFMsPqXi3EZlfLhIfiI9T58zjqVoEvAAZITOB5kbcrEQ/u5W/SoLFYZs3FXDDYek3rwoMrzFsel6B7+JPuyMO9v4xy+Aqou0kDMpKOzVDmVyyICLzQQQX1W0bWZecbjzAYy4lLt6AUkh67hc5tCaPt/ls2jJTyzhdGJe/2Af8tI5EZtbP7k/oVLywP9Mmg1WA== X-Microsoft-Antispam-Message-Info: 5xYQ2OUUdXb1pDFtQigj3fL4k0nbl2TaeC/M7F9PoKuDiPckUPNtUyb9zsCveCEbRPc93S7SJ4KYT+N8qgaF5imI5+4s6F7cV24zbDIKV0YpS6w/p5H+O+Zi0xq0Bw0UEjl54ETS3MrKIrLs1syum8XVnvDEAHA00NnzRz9fIwb/c08gSalDpa/dUnObbOHyrLJAR3TZjQLD2Fs2y4upEeA0RrzQmUBn4ucM9jve7uel9WEnNf1CHlgWGZL/H/xdyfETPrbwpYEFcDBVcnLJYiOjvcERePbIGaK0NMO3s82oA+U291qi5Wn2KbRZ55TqO0mePcUiqXt4bNJpHMOssvlpR/7uhmA5TtOunVlRAh0= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:m9X8KNb5cPk+B8uFKx7VXokhTYjkU+B6R4FpQwP+snZ5EaNCuG2ap3Bt6jNG4tarm2y/pr0o28oaeIT5k44uo1L4Dxk4GuFU+tzRUe41zXA/ikAf3Kti6H5DjnnNqDoe0OY4CFX+jztp+y1mlroz7aIPq7bsS8Mu6PlLpE1Vk9yjgWpt/Y4berk97UGvKPgghFJH4f0FvE52lMbGa3chXc+/F/vv6Bwdkg8uqLxfwkbSCQ6ZrhQQ6f/mgVIMvxz8wK/QvshN8CV540cFMfTEuVFWz3F06XmUI3ItULUWd/TmweT+nmcx61nrVgvE8c2Dn1lF7tTMpmo5uZElKxzH+8+6kKQdeAxWifs17NXEj5hgClw6PvEZCcfTWR8DSTUuTdK5vlUjIwcT0I+pu3i4bbXcFrayiTsBT1RF9jt/8vzx3k08u6ZQ6PMyCAQtXmKzxA0Lg5tq+kcYx1yfgV0yng==; 5:0wZtPhZiKRd/x/u4JaeFDRrZMpKX+iO73rZUpTpDe8+mBa3ZlEQeAyAFna4JyH8aByH/hXrivZ6YzHdkEQbKDUwmmgwLfNxahfcT5bI6Sy5EB9wTdTxCOcLZ0LXEcOLDGoTh3pjRjkYwc38DwJ5mixgd37u3ybKLJH9KZy52fto=; 7:Y9b8kxOq5nytn7QA2/3O/41MPk5OiUxil+hnq17Jjp6QIplOYOqwr5QP1FPwx8VguVBOx8tTdFDNKysKVj+VBWZbF5I79CkCdxZNRYehQJ7Z8D0ouVGuNCDWYCCmc8+dt5FVDWbdRk4137MpAtPFlITG2YH47k1qdSSR0Y7aatsyAV8G2S+RlgFvpXZxWeVoI/dTtFu9eNaHGKzPgLFZyF/Uk3ms3FIt392MnG2bxL5o+ygK+mp08RjxjGVkaZ+/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:01.1846 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 235007b6-9dbf-4822-ead8-08d60c641b94 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142921_997540_9465E41A X-CRM114-Status: GOOD ( 14.17 ) 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.5.84 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh mesh join function consists of 2 parts which are preparing configurations and sending join event to driver. Since physical mesh join event could happen either right after mesh configuration is done or after CAC is done in case of DFS channel is used, factor out the function into 2 parts to reduce redundant calls. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 124 +++++++++++++++++++++----------------- wpa_supplicant/wpa_supplicant_i.h | 1 + 2 files changed, 71 insertions(+), 54 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 38b9fb3..9bbff4c 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -34,6 +34,8 @@ static void wpa_supplicant_mesh_deinit(struct wpa_supplicant *wpa_s) wpa_s->current_ssid = NULL; os_free(wpa_s->mesh_rsn); wpa_s->mesh_rsn = NULL; + os_free(wpa_s->mesh_params); + wpa_s->mesh_params = NULL; /* TODO: leave mesh (stop beacon). This will happen on link down * anyway, so it's not urgent */ } @@ -147,6 +149,41 @@ static void wpas_mesh_copy_groups(struct hostapd_data *bss, } +static void wpas_mesh_complete_cb(void *ctx) +{ + struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx; + struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; + struct wpa_ssid *ssid = wpa_s->current_ssid; + int ret = 0; + + 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; + wpa_s->mgmt_group_cipher = wpa_s->mesh_rsn->mgmt_group_cipher; + } + + if (wpa_s->ifmsh) { + params->ies = wpa_s->ifmsh->mconf->rsn_ie; + params->ie_len = wpa_s->ifmsh->mconf->rsn_ie_len; + params->basic_rates = wpa_s->ifmsh->basic_rates; + params->conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_HT_OP_MODE; + params->conf.ht_opmode = wpa_s->ifmsh->bss[0]->iface->ht_op_mode; + } + + ret = wpa_drv_join_mesh(wpa_s, params); + if (ret) + wpa_msg(wpa_s, MSG_ERROR, "mesh join error=%d\n", ret); + + /* hostapd sets the interface down until we associate */ + wpa_drv_set_operstate(wpa_s, 1); + + if (!ret) + wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); + + return; +} + + static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, struct hostapd_freq_params *freq) @@ -367,11 +404,13 @@ void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s, int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) { - struct wpa_driver_mesh_join_params params; + struct wpa_driver_mesh_join_params *params = + os_zalloc(sizeof(struct wpa_driver_mesh_join_params)); int ret = 0; - if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency) { + if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency || !params) { ret = -ENOENT; + os_free(params); goto out; } @@ -381,22 +420,22 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, wpa_s->group_cipher = WPA_CIPHER_NONE; wpa_s->mgmt_group_cipher = 0; - os_memset(¶ms, 0, sizeof(params)); - params.meshid = ssid->ssid; - params.meshid_len = ssid->ssid_len; - ibss_mesh_setup_freq(wpa_s, ssid, ¶ms.freq); - wpa_s->mesh_ht_enabled = !!params.freq.ht_enabled; - wpa_s->mesh_vht_enabled = !!params.freq.vht_enabled; - if (params.freq.ht_enabled && params.freq.sec_channel_offset) - ssid->ht40 = params.freq.sec_channel_offset; + params->meshid = ssid->ssid; + params->meshid_len = ssid->ssid_len; + ibss_mesh_setup_freq(wpa_s, ssid, ¶ms->freq); + wpa_s->mesh_ht_enabled = !!params->freq.ht_enabled; + wpa_s->mesh_vht_enabled = !!params->freq.vht_enabled; + if (params->freq.ht_enabled && params->freq.sec_channel_offset) + ssid->ht40 = params->freq.sec_channel_offset; + if (wpa_s->mesh_vht_enabled) { ssid->vht = 1; - switch (params.freq.bandwidth) { + switch (params->freq.bandwidth) { case 80: - if (params.freq.center_freq2) { + if (params->freq.center_freq2) { ssid->max_oper_chwidth = VHT_CHANWIDTH_80P80MHZ; ssid->vht_center_freq2 = - params.freq.center_freq2; + params->freq.center_freq2; } else { ssid->max_oper_chwidth = VHT_CHANWIDTH_80MHZ; } @@ -410,67 +449,44 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, } } if (ssid->beacon_int > 0) - params.beacon_int = ssid->beacon_int; + params->beacon_int = ssid->beacon_int; else if (wpa_s->conf->beacon_int > 0) - params.beacon_int = wpa_s->conf->beacon_int; + params->beacon_int = wpa_s->conf->beacon_int; if (ssid->dtim_period > 0) - params.dtim_period = ssid->dtim_period; + params->dtim_period = ssid->dtim_period; else if (wpa_s->conf->dtim_period > 0) - params.dtim_period = wpa_s->conf->dtim_period; - params.conf.max_peer_links = wpa_s->conf->max_peer_links; + params->dtim_period = wpa_s->conf->dtim_period; + params->conf.max_peer_links = wpa_s->conf->max_peer_links; if (ssid->mesh_rssi_threshold < DEFAULT_MESH_RSSI_THRESHOLD) { - params.conf.rssi_threshold = ssid->mesh_rssi_threshold; - params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_RSSI_THRESHOLD; + params->conf.rssi_threshold = ssid->mesh_rssi_threshold; + params->conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_RSSI_THRESHOLD; } if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { - params.flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH; - params.flags |= WPA_DRIVER_MESH_FLAG_AMPE; + params->flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH; + params->flags |= WPA_DRIVER_MESH_FLAG_AMPE; wpa_s->conf->user_mpm = 1; } if (wpa_s->conf->user_mpm) { - params.flags |= WPA_DRIVER_MESH_FLAG_USER_MPM; - params.conf.auto_plinks = 0; + params->flags |= WPA_DRIVER_MESH_FLAG_USER_MPM; + params->conf.auto_plinks = 0; } else { - params.flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM; - params.conf.auto_plinks = 1; + params->flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM; + params->conf.auto_plinks = 1; } - params.conf.peer_link_timeout = wpa_s->conf->mesh_max_inactivity; + params->conf.peer_link_timeout = wpa_s->conf->mesh_max_inactivity; - if (wpa_supplicant_mesh_init(wpa_s, ssid, ¶ms.freq)) { + os_free(wpa_s->mesh_params); + wpa_s->mesh_params = params; + if (wpa_supplicant_mesh_init(wpa_s, ssid, ¶ms->freq)) { wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh"); wpa_drv_leave_mesh(wpa_s); ret = -1; goto out; } - 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; - wpa_s->mgmt_group_cipher = wpa_s->mesh_rsn->mgmt_group_cipher; - } - - if (wpa_s->ifmsh) { - params.ies = wpa_s->ifmsh->mconf->rsn_ie; - params.ie_len = wpa_s->ifmsh->mconf->rsn_ie_len; - params.basic_rates = wpa_s->ifmsh->basic_rates; - params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_HT_OP_MODE; - params.conf.ht_opmode = wpa_s->ifmsh->bss[0]->iface->ht_op_mode; - } - - wpa_msg(wpa_s, MSG_INFO, "joining mesh %s", - wpa_ssid_txt(ssid->ssid, ssid->ssid_len)); - ret = wpa_drv_join_mesh(wpa_s, ¶ms); - if (ret) - wpa_msg(wpa_s, MSG_ERROR, "mesh join error=%d", ret); - - /* hostapd sets the interface down until we associate */ - wpa_drv_set_operstate(wpa_s, 1); - - if (!ret) - wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); - + wpas_mesh_complete_cb(wpa_s); out: return ret; } diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index c6d6d84..d02c358 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -812,6 +812,7 @@ struct wpa_supplicant { unsigned int mesh_if_created:1; unsigned int mesh_ht_enabled:1; unsigned int mesh_vht_enabled:1; + struct wpa_driver_mesh_join_params *mesh_params; #ifdef CONFIG_PMKSA_CACHE_EXTERNAL /* struct external_pmksa_cache::list */ struct dl_list mesh_external_pmksa_cache; From patchwork Mon Aug 27 21:28:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962653 Return-Path: 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=) 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="h6jBjmIs"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="n/4fG4E8"; 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 41zlVc31N8z9s47 for ; Tue, 28 Aug 2018 07:33:12 +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=LBzMSZRpjIxaFVX9hg493pZAWHCEMKmr2+HGy3YyYDQ=; b=h6jBjmIsGZ5iEg SLnPSof0mdHpk3rdTv30WSkpZJd+VxKOlhkIgyrez7nxhIqVh7zlPXmazQ1mKYXiwyamC5b9025Yk g534kosxLhoIabSOgbkcGVq2W5yGqFI2h3edSW28HutgV8RVD1zAcYBVD4trNQL0p4Ssm+CAEpTWX HX0TNKjcqMqgOwAvy1ZIIguSvWVUndFx/vduI1ZaVNl2hjNKFdBYXT0ky/p+qMgIbujpdbWR8B8bu BVIhq51/60lb58Ebe2zhLvwlvraLpMPpxxNszJmPSnn5SyqiBwOIyviJZvts5X8+n8rwXKy0oiw0k qF6Q5uDZzoZT3wvVSlbA==; 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 1fuP86-0000yG-LK; Mon, 27 Aug 2018 21:32:58 +0000 Received: from mail-eopbgr50059.outbound.protection.outlook.com ([40.107.5.59] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4h-0006Rn-M8 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:30 +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=ub77/SJ6C6IACDIOFudcBBVvcKfRr2iuRKauzsqyu6Y=; b=n/4fG4E8H7ED86Qg0wa8xww8d8INkeb4GTHRAhdNn3idg+owZjx5oaVBwhGFbu/NR58y0dyo/ScpvklWolT0RE+b+7LSSdg/CHhXz32WksmN8UhVzp2Diryi4Nu1i6lHFOawSYPddB8VEl/69q+Dz2+BZ8BQ0uTIe3QZfx6X06E= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:02 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 02/16] mesh: factor out rsn initialization Date: Mon, 27 Aug 2018 14:28:35 -0700 Message-Id: <04ee619c23bbd7585469d656c00677fc376c2b8c.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88e435a3-5a07-4aa8-6c6e-08d60c641c50 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:6puV6uZ6h88/xkMFjUabTVsy5ofmRbjO25nPJnf0VsOo0F2JX/sTt7TJUDw+8d3dzFeTFZ4986cyWYrB+OIl7hOAVtDW6jeCJ8nlcr/mlDWow1udjVOaUOEb7opy2e9szKSZ/3Sy44aKyRKLWBoCsCiRHlMp0eH05uzDY6LywmOzAuYyHGeMokjHKeUZqeoKMshZhSmAerQySuzDdJHjnzu4ygbvtw3aN8PdVTUpIj2Z56T96X0LI4B+7LgsocwT; 25:pVQzgSKflCQEY6CFkF2ngd7G/FHJlWExuqbvKCsJid+vXG1CxC3vf1Eiuk0EVpC/zsHcGHgMQWeI5PIKxL2wQe22xyPFEaBIaOQLDm6Ah6qAEC4Bh6dP+v8W8TT/pJPVY0fAty3tlJsF+VHdUgoeo67t6xjQ8zF7WdktJrrYSRSO/q0lHDEjGj3JBfavj5jhjdpwHsb/O/pJlp4KbHQN9aoa4o4jRd4edRkfYxC7L6b/Vc2tDzhG/Wz6F5wh8/PE53WfBE5I138rCQWuh6JFFP2UkE47ElPtSg7JcdFJC/x/Q3n1bqRJ9w7u9g/AS0H+00HjexaVXIS+JYbXkAafsw==; 31:cAqRHP4FN6bfh/LGnJ0s8fHGmJ5Fog1fkaQSjlsuC3T8ictaIdzhGxrpT/SXvIT7BwlyyvSLDuP97+MMH6SIYPzMBi3nyhIK13Sa+mYfOm8za/sH7uvuZGmXpw6lR+DisdyByUsWhC4AWTpuZE/qRpLl60nXV7sMvhrje0DvQOBrOSif2m2vYxQpKIZOPKXmYIQ5ajwoGCfP5k6Vuxpa0VMGgtZuzOBhFRwSoAuB4Kk= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:VfrmBkWFkOBv3YFUonFX+BDyBvJQdVQSAltGqqWuqVO6qSMxUcaMdRkAGFIEulccaUoZ8wEeb5xHWumJqM+PRf5P/AzDWv0PjV+VQPEvMvmuTZoJTeJxTERvjKVuNt9s8YsbirNcs5qbhP5g+RLQcdkgn0cbdg9eh0aIjlNqzNEqEKr3E0oWm4c/q/9KwX8LQNVXYc2IVyNiLzJAB87aFM9TVxz5y0Xew+sfg3r/LQrjf/3k9uz5Ww7v0Ai8lQw6P3deAD2STLiyURJZ66cjy9teacCMy3Dr1CXHdcVZlogQqow8f7IxEKr0YPWtUTPfrbVK328wU2Qyy71i6UWVQgTg4t+7GrkVrrS97t8QuAj5U3KmCIQVJx1M5ixUmT8L0v1n+5Se1RU3R4mUKsUNOTKBCtIt6xeqae12E235VWxD0m7/UPe0DA5Z4Oqp/tvF5/GlNnV6oo3CJADFNbR/OivbbYJOvGCe+3tSAAa8jpRMiSQB7ZjbWWkmq0kumQ8u; 4:fJ/VB10O4brrZUPdesxgETGAPAPpiLcIOMf6mOjvlYJ9w84KNy1Q4ptLFGvBXhSLSH6W7w2t9vYh9l1Id6gaHOGF652fKCR98KpNdeCdvtXCxouHj2M05xfbmI9b1eogC1beuPRyfznEUBw5jyMEPPt3MJ0tXUpu4p05EOhYs85pstEZjisAhPKrtcbqrO90SsxVhqB0/ZoQ5QCgQHmDcjvtEBxYK4YT/xPADCkL1pLG/+XxVs1GtjDbIcYual5FNJEGqgBQQo6VWgTJTajPe6ftscKaryg8aL09O+psBV4mNW1ag4AtgTpcd9rvScGo X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(14444005)(551544002)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:3qSfIJRSFOXV9jePyXH3VEugFnpmBX90AqzkdfZsW?= 2WAidkQzcq6PP1uZq+1aMTJ0pjwEI170pJrxnfWcxBK8ilI+A6Rl0oFO6IT2YncSH+KnRBNtjSfQtYDVPZeIQvSGlYO9LSbwO2piUtcmHZL8eGIoE0d0V/bA7G2LjkY9zAHomNzmlPdzpPtEVw7vdKU/fXnLAHMvZZmWEUc89Je43qVUZmDxLNSClSLvxO4ulcFtijZixHo3O2t8lndUkn7bY9arhzi5+tm6oFiAacrSgmFfmHki2g8incWMuoDuvinIehV054FwK+nFpsOZIuMaky5ljQBB1ZNCFN4qO3wOzP//tkrwxDhP7AUQgcVz7wTawHaMa8yN/N4nGKyAIycDJsPc/fnflfXcH/P7BsHHeomIUaAuRRtdgMq8x85Ig83wP87UyGjUip+kVJHMXXXcZhx9XNqbp/YXHx4u8th3kSCN2ojQ6B33jWr3QbDOWHP4YL8090oe949/DrTfx6dkYHjm6XWXtJJkqqVc7TRcrEgoFRA2e1jA4wtqWGOgTbTA5+NtNShb8ong7fgihDx3vvsOTG8qK/8Jl+hgU1huBtljc4SpkORTpa1Gf8F2rUhHcaRLLKpG+JoE7QONtL+mKlq8GKcp0wmdkYLbQKAfcA97JzSIflwF5i7Rvrd1pQAoT9LwsIRbopHr92bntVFYDkEZs0pgT9P0ZgVvhXnt6lCU8vI8L9RXLqIxlFL2vGS0LPEo/PY1j3STns7QlZdBCxfaSbFwgbWxJcRr2CK1aR3cE8++jTG8O7nUSRuBf1WeCvX96ScCGGOMYsNNXrPJFKi1R8pHZhPl0UP9U/pidiOWDiyQUG6GzB2B7ahayo/uMwMfccS1dwvdLY1FncWcBdW5X+z4pKFhgrV37k7zyZg1P6i9Dvglc7AB9i+q3eLXzRw2sOWY8XkekAQrTepehDpUF2/LaeJpe9wqErxCP8hNpSx3vIQVeD6xD1toBcwIWgoWvojv7BET7A08dwcEnW//JV2LJbeVVO1nCLv/FmsurhqqBudFY4nU35TgSuDb2xegy6FO1XX4/po64u0ql+oBnEtcvn4nR8Ygz04pDYUYXR9WsfUSEjPfxZIS9Yd565tc/DPj6uvR8VkYn+h01u8yp3+qAkAkQGtpF4onSwAhokDYtE2GQe9NM+AgC3GyNKnodnxRLg/B0Z4noVMOQ7zj4UPgykEcCrhiixBiarh5/xeefoJobcKAU8mjZy1+7axSVhmimZW+fpHkKkhe0Wfz5aDu5dr1wWE8SX5ySrr/CYzDvdCHgThBcA5w+zsE7OqlzseA8N+MwrM7o1tcyWGmdctnarim6/Xde8YFi0NlUWxPYWi9Y2IhKTnsDAG8dJLe1wVB150N2X/hqIR X-Microsoft-Antispam-Message-Info: aY0vGWEgQEfZw7WPMN2iyTuloqDJvcfn1Gm5QpFU6JWfqgkeG2Zo35lry6Iq3Kxqzm469Pi2c7TCu6FsOfE7vZSRxjmwUjfRgRC8Al5j64SEXEvPguO60UkhbKmBYURsEdECx756faK75k0Koher9tgNoDweuPa3DNN3zvKtRsEhzwLe2jZOuKv97jYgQmoTjkfRhiDCvby3RaWFxNxe6BRK+wHjha4z8cfAydjizgb81VQwGJT3L39fbHSa9kObvDS3cyvZXklV9hDtf3J7H5coMcPF1JGcuQxYg/G+gB6KQhYk8W4sun6oL278fsKW7JFOxTZLEEPaQ70fm0kH7HxasEZTopVXGTRVkUjUv1M= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:kpTrB6GhQ++eOCyJBzH0IhEAyjXiQBuAJ7uBNPKB29aikwI4dG7sWoYjhwjusen15lCWXjZuG9RVpP94SgTP8oWA4JgKkkjEiti+W9Jl4FElzW7FCqIpgXjY78/p27CbmmcbAmGfLOUp3f64cqDi7+nyJav+5qlW8fopEZWL2vf03IxhM6Fza6eAAfO8P1di9jY19d7eUqFoc+KD2AoJUzYuG29+uR4dwD1f/uzAFM4TGqM5Gl7zwm0xH/0BEHMIs+v/5fyxPfc4ejMeAd+8s+LrYUg3Cs8B/pYFIVl3zCBj2Myo/JZH/Re2/1wCWt+G2Tugs2Ecv9/M6pT/oyjuRR8Be31d6riimyrYfpktCn1c8/izXtE0sxWDJ1jPHSGDepZO9KjSBJriJ8yXeN3QbgdAakvt7uqutEDP5kXEOLuXwhWyoPI6DWwhrnw+XDsCDuc+/RPhax9XxCImAq9iBA==; 5:OO2TaOyWHBlJ35CpxKHA9vYrMookGzsyWR1hk1llTTexBqtGEABSwithXvjH85QMYonMQACCIkS4rB4bZdvdOcnLeLkO2vkDXhnVJTtjNRceEGNe7IakFXpowIB3V8+a46LUFX+EtNaAT95Vax1oxQBg8Fsl/13el08sO7kFwuA=; 7:3vWkQCSBM09j0QDK9AiEtjoQNbYHgm9qNHYcgaDR/4imWErcghIBqBpO5RXucl6a5b9mBT5JOxjnnrMo84AsyQjxInACFAFSAPVfbRe6+UJ6i7/5GIxaDM2KIDSmD+DOuK5eQFPOkrM14OhWvvfbK6++BmIsraDfAGBmsEWW3iAPLmH/7YdQ9RCmOPHSTcau2OCGsx0mXVeJxXHI4NQ6+mP7QJlNs0sXYWw+M2F2WHd1pMIMuAS5Kche82P2MOKB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:02.3704 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88e435a3-5a07-4aa8-6c6e-08d60c641c50 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142927_938109_2CA21F41 X-CRM114-Status: GOOD ( 11.31 ) 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.5.59 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh RSN initialization can be used in different phases if mesh initialization and mesh join don't happen in sequence such as DFS CAC is done in between, hence factor it out to help convering the case. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 84 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 9bbff4c..d126087 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -149,6 +149,53 @@ static void wpas_mesh_copy_groups(struct hostapd_data *bss, } +static int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s) +{ + struct hostapd_iface *ifmsh = wpa_s->ifmsh; + struct mesh_conf *mconf = wpa_s->ifmsh->mconf; + struct wpa_ssid *ssid = wpa_s->current_ssid; + struct hostapd_data *bss = ifmsh->bss[0]; + static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; + const char *password; + size_t len; + + if (mconf->security != MESH_CONF_SEC_NONE) { + password = ssid->sae_password; + if (!password) + password = ssid->passphrase; + if (!password) { + wpa_printf(MSG_ERROR, + "mesh: Passphrase for SAE not configured"); + return -1; + } + + bss->conf->wpa = ssid->proto; + bss->conf->wpa_key_mgmt = ssid->key_mgmt; + + if (wpa_s->conf->sae_groups && + wpa_s->conf->sae_groups[0] > 0) { + wpas_mesh_copy_groups(bss, wpa_s); + } else { + bss->conf->sae_groups = + os_memdup(default_groups, + sizeof(default_groups)); + if (!bss->conf->sae_groups) + return -1; + } + + len = os_strlen(password); + bss->conf->ssid.wpa_passphrase = + dup_binstr(password, len); + + wpa_s->mesh_rsn = mesh_rsn_auth_init(wpa_s, mconf); + if (!wpa_s->mesh_rsn) + return -1; + } + + return 0; +} + + static void wpas_mesh_complete_cb(void *ctx) { struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx; @@ -193,9 +240,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct hostapd_config *conf; struct mesh_conf *mconf; int basic_rates_erp[] = { 10, 20, 55, 60, 110, 120, 240, -1 }; - static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; - const char *password; - size_t len; int rate_len; int frequency; @@ -329,38 +373,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (mconf->security != MESH_CONF_SEC_NONE) { - password = ssid->sae_password; - if (!password) - password = ssid->passphrase; - if (!password) { - wpa_printf(MSG_ERROR, - "mesh: Passphrase for SAE not configured"); - goto out_free; - } - - bss->conf->wpa = ssid->proto; - bss->conf->wpa_key_mgmt = ssid->key_mgmt; - - if (wpa_s->conf->sae_groups && - wpa_s->conf->sae_groups[0] > 0) { - wpas_mesh_copy_groups(bss, wpa_s); - } else { - bss->conf->sae_groups = - os_memdup(default_groups, - sizeof(default_groups)); - if (!bss->conf->sae_groups) - goto out_free; - } - - len = os_strlen(password); - bss->conf->ssid.wpa_passphrase = - dup_binstr(password, len); - - wpa_s->mesh_rsn = mesh_rsn_auth_init(wpa_s, mconf); - if (!wpa_s->mesh_rsn) - goto out_free; - } + if (wpas_mesh_init_rsn(wpa_s)) + goto out_free; wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); From patchwork Mon Aug 27 21:28:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962645 Return-Path: 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=) 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="AZrUWqEE"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="B1mui6IC"; 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 41zlQw727Pz9s47 for ; Tue, 28 Aug 2018 07:30:00 +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=WCxj5ecrwtdNsPpIBSDSLVMtuosuEdrewVN/ct66Gxs=; b=AZrUWqEE3BtaE1 E0bkrle9uij4E0tkgtixTupiTHZswe5Ul3HU/HW8CVNeJPhNOO6wbvmE//OAOZMbT0kZ8K50nxwGZ QWBl0D0HRBuK9Z2XVpxoyun/B743EzahxXeZMvjnbX0DTA8h9NbZQXl0jcSFhdtyyeTrNFAGzXsSj i9riKI/zWy+MFTzNu3ueut5jFrBBinQfdvBe0Q/HZxnL4CHtetIe9EIoZ+/9YTQrMjDwHQcP6+UPK spMaQ2qJach2dJ35ZVTfdyTLd7s75evI68/S3bg7X1f/+PfM3LFWkq+2jxpx+xtZcejhAhWPrx6mA fajK9eYYa9qtLI9OMnSw==; 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 1fuP4x-0006dd-E8; Mon, 27 Aug 2018 21:29:43 +0000 Received: from mail-db3eur04on0603.outbound.protection.outlook.com ([2a01:111:f400:fe0c::603] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4Z-0006Qn-8c for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:20 +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=DNnJ/k8kPjG9LO4VMjA5JGWRnRlY74HcDD11VsMKipI=; b=B1mui6ICltdoj71pjc2+JlVwams4cz5hMVBwLkdILmcCVWva0jxAh1iesgJ+INPZ3ejG5/Zw5P2kbk5KMsVRzqa1y87IlBW/T5es0I+To215L00ZikaeV6zydfjUmIiTAjwGTNojv11i5pixwe5FM0E7pg0Zrl1PvK5+EQPFmxc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:03 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 03/16] tests: Update mesh_oom to match implementation change Date: Mon, 27 Aug 2018 14:28:36 -0700 Message-Id: <10f7e9ee59fdd0bcc7629f27214eb2e2aa854593.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f111a1dc-fc27-4ece-0e4b-08d60c641cf1 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:a+5+MfNXdEMcSvYQD8qePVg2mkHE2FFjSdBbkoJ+0bd0Qe5tnK1JKdtzE/t8u3KgZJdLS9ck3mFKFo6G2VD5LAappczVnpkdv19FZwhPvEjZSLfjK06hHeB9fAe1hCCJfDg0jnM4JLHw0EeNQJbbx9FcwrlsuVulb7f5L4XZcRSuNoDzPvblEpfrch7LR4QcwaJ+BJpz23DUCTcBPVOdQotucYAbtQi/lgit23+sKQgvX5wW0xAkLRTz+sZJe1+e; 25:pHUIfl+r6wwETmbThxvW/su4FZaZWIixg+tnvIoju/ma3FF8IuuU4HLixoKLNCETOye4nduxle9XPoOfGdTUQRWOH4YhWj1DPJogE3PR1JfcLoGfYzuye2nchdetNca1QkRAWYcXMe/wgPFa1/gzgEAZkckSO/W6ajBkuNsokXdxR9ajgHXv3ePjZYZcTaKproXmPEOtLoyCLeTtwaTyqLBoYE+Rqf5ov/oF+4nhW6ks3BGxo7a64pa2x1cd65usnNWZxnV2alsjrLutHu0J1M9hV/ZQOtoxN00Myev5FLQt4ZQ4CDG5+BOitOTARCsEXNGNIVbhl8eKautdIWCJJg==; 31:J2o9DGETolFglWUQDKYlmivCs/uvEvlJgz4PxBCUB/j8CB+cs9Dw3WsfDbBbqmieOZsmTvcrorLBxkqTM1z97V6zjtE7IVv0/h6JY43ISOv1KcTimR0KkIkE11cpwh5+KAc/QDJIWBdVgc3gmsuBjRQem1KhPGhqnhlXb1MZxXA+8wa5swRA+9jm+yFFg/H2XX++0uXQEOTGqygh5zX0Jgb4jInOuoxx23iDnqtfmvc= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:Z6tWCGOAkyy5aU1Z8WdiuSXPB6Y35fWv6jAV6wKt76RlbLJSSEZuCS1GI+MDaJVZDzphc7LMKbPjhmp2ImdG1yo6IJFEQ0ls/oPdy+GOCrh4JRzoBYHUACAkipY+T6xf53pNsUWLW80FWUlSABnyh872rGDuMAQUaF6HmWPfSdxWU5yOAdDopPkASzxomXbm8zcXr6HitewCpLOJUPQgN/7XG4TISspydxLvL1RW0osVTzu1u4o3PNxryfRoLkp9LwsiKIJrygDqdS/7AWUEp0aXh7pGwyy3I6/hTHWEHnNt1qQi82RItFuvsrKR0eNwdFNEO8+RoK7txIMAFycwrZATF4Smc9z8FI4eIZLIJ0IXz9cY5NJmBJcR1dADGLJdDrGp0CLlOmJZ6sUKHPDJUMt+pKSqK8eHamRDc4HQ70GDKVk5uiF7j0wk9RQpYintIcoykPxVcFbSjzsHBCRYRpKMLSqQn1W7dFibJS0WMJKDBnSVyxQ+Y57ljOmsUjMC; 4:Mrup0tVAMsOtdRt9gmlFn4X2kFmXe4Jg7VEvyWIg15Akb+vT0BG0gVRlwxq3hEvmLwXkOkn/xssRUSUoU341O4Um3FnpepttJU5gw+GCh+M5H6ziGYReXT7TuS64AZ6HlzIkfObUiYtDoSW948gZ7i9kzCX5XcgPL4eipGEzDEtDWFXEntrcA96XCCx0StE/2Pd83VYjSzUTdwQYoANcmpwo5iW1e+N3AgXTwKivpWh9mRC4r9gKqH+uPtDRp5qZna792oMKx1ucNF6hRUX9QzsIGiBHRareBzveXH4FQRH33jDxx71cXiwOp457fN0o X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(127540120423786); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(14444005)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:8BVN+tozFLGqZiJyJcM7zk0ORT3Uh4EIYnKbmzTfb?= 2WfLl9at6AoL4jM5lZoyDvUemGbd/VEODL7t7VV4NJqtm/H/3fdDvYPhknbkuTypKbYG/WEMakF4xpSA1Ht/57ohn0kFD4+4fZk5iJ7J8LZ+FRWdmYmId3jzJGHYlayvvPl6igOD0NogBa6MsaoislVYaMWelWC7pRvDCMCU+dLnFzUUNVZ7RBXDkgOyJU+pk0G2InFEW3kw0MaH0ZTxU0IXHNdMXTkk4dUld9E2Du/09wlWITqxHCYSKOkxCLrtKddEnzKJsE++xtophqYQUczHukiE/vQSp7CXEanhI0bna22nzzEowXJmWN6Nrxi4DqUSeV+94twMXtdT9THtQxMIg85CZZrlVpIggBhnHhU1EXo5W9pDdYfQAkjtsaL3VE8i+dqeZHbJ4bpduG5XP226+nKrlppVndy1/fJbASS+JzL4KCuMFJiClHgs5CAUdcmhoS57hM9iQaE1FG3puiWGW5al84ZIAFssPjfWoIAi/QdzxmXQsAvnuHL+5kQ0eB6G03yxJLzXTLdSHxFSrqwsbtLwUSllaUwBOnvWzTwe2RrMaX1yJEl3oTjH9ieckVkeOuaM7OM8ChyLm8+7dfdOq3R4MzCyOo94IumWOuYArGG4dc81ZoyprJO3oM0fngC5ZaPvR36Uc2dzcAayhj99A6eTmmcbPc4/+Ig8X1G5vwa7JNL5oO9E5/HpMk671gPMGobkmmfdluf54YHA/VymH+czUSbYb+wn50O1hrQWVY3XsEvKf+tapcn6Yw37ietJIOWV2ce23HZ2deqSKtOcyecLFX+3ISZ2FtD1iQ+R0ISR1bbwFlgT9bdnknh87+GrgRa6ru9rKkYFogahHn6ynYYOVtPEyaZBMa32fnVUKusFpWWTt5h6fNTqN1YqW4+XkNHU7f1TfkCx0HpCQVh5j02aGrCBshqaE+DYlnPvD2jpK/7I6Hkpf0XE/NqqpShzhgNdLVpBRfPa1qtBR0swBw4WG0dZx6UUv8p56HjYOTCGc8T7hJeg35kIxXxF25VGPpUkPFoTdKqZBNbNSs85hai/5WWx58VUfGXLsZXiyjzb1iWYtN3uRSvF6V7gyM4N76UTJge9K3Zed8cfGS5ZVulypWi776ipYEzr0KozDzC0WHQIZq3JCMx3aP+9KAj696b/LlSFgS6Gx7U/4DasNZ3AR0dTPU9IXDE0rWUqmGe3iZb/DjPVy4/+kpM4pOvWCIx4AJcZWO0NORYbTc7rgI2ma0Uh00+TaGezpra8QXlI7Vajd/ihxxx/2Us4G9e1IkjGVn3uWPxbu57FYksbabWAWGjoir1CQmPDaqX+NNsxoYjoljpM/sHzJuN/D4= X-Microsoft-Antispam-Message-Info: 8DFXqE3zi3gt9HTN8gmPWqdRNNYTH9N1uZPTzhmEkm6SObWcKLKElc3SsQwzkGWiWDxSsAsIKPJNP3wodt/PSCkGeE7cna5kpYXRS7FP0JlPq3nBMh6PtIY5oPAtCE4r1PHFemxHA8o2ph6CKNZ9LKCqlaqfaYFpT/K3pxpkbTU2cluKnj56VHb4fU45TSFm4mJ+/Wv1gD9FuCYqs+LWTLeZT7HfEqze1Z9A+co9l/kVQY5F3iGLNpOWbnaYuRg6kK44XfdDVP8bG0HIPiMJ5wYyNPbhTj5D7zl0n0sFF0OokuI/1o11resVJsbzKe7MLGrxC9xbOxy7j9CGdNI5IwhM+TzomZlThIB3c+lF/48= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:+rYYa2+ASru3zRHdnB5gs35djwxnxn97UnGqw7KaMIBCP5Mc8bNo3lDlZjALDsMOcJuuHVRJNbLhVeVyLrrwEmaaIxfdHDNp0UeEdJuvngqtooPro5XVf7CZupVLGZVXJ9rct3y7uqMLZklrqaFURCc/dQyqmE/aK9aObB35OJ6YQip9i64hmfrA4bXc6dTHFcV8hoDqj9h5si8gJacvOzpJLfbyk92GZdARPDLdDaabVr50cN9a3KBJPP3BSTzCtKfsvnb/6ZhryK5SzeUMnnjFozyp9t0R10x5cZgfFe1WLlZkvkP5OMsa2MfJc6+LWtTagJeQCaieAvld7LYKBtOFyeorm1MX8ESXRbhLf/eSIRr3EXlb2t+EKCbmu3fOnsTiPqFwjyHPloXui1G0zMx2OUGl1hHPchbEG7T6Tx1rEWgBDGrXx9w5SUM6Fx1FUwbY0xTz7mJo/dzEp8vyXQ==; 5:xFESedWB06MwpOGdI6zMZvFEZYi0bNN4JQ1lOqynAmLzqkQM7kdhO5RMKhHoNoIe3tUtvv/ok1ZrDLcJxjP4aOOJiGFtwmG/fkEpq6aFXzA6zs7wnwwt9F+j9AvNHphneZ6tamIv1xH9lptuhXCWsuCD4p0A8Y141xIuth+7YOc=; 7:PhPi2sBGwWjKn0LUIaGfG7qEUw8VVCGkhMCVk9EpwneRU8vl0KwvsVnj7BCzSt5UVQNtInQURxifDfzZur0nwX1s0ymSUWBAQ1dAWzYC8bY4RE9i7BzU7AZyBreHn4+wcfIULNG4LeCIb4qxyYKbtOaAUxVA3mXow6+sbV3DwnNBlFGvpONBh4yRP8khn3xXAFnpqnft6vxXv9kZgzv2MeSUs9m/0xrdvIDoF/IN4ZuVfsS3DMDxude11EjEjGI4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:03.4702 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f111a1dc-fc27-4ece-0e4b-08d60c641cf1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142919_342207_A9CFC97E X-CRM114-Status: UNSURE ( 8.93 ) X-CRM114-Notice: Please train this message. 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 [2a01:111:f400:fe0c:0:0:0:603 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh The number of direct allocation within wpa_supplicant_mesh_init() has been reduced due to RSN init function is factored out. Signed-off-by: Peter Oh --- tests/hwsim/test_wpas_mesh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/hwsim/test_wpas_mesh.py b/tests/hwsim/test_wpas_mesh.py index 5feb9be..a3986fd 100644 --- a/tests/hwsim/test_wpas_mesh.py +++ b/tests/hwsim/test_wpas_mesh.py @@ -1664,7 +1664,7 @@ def test_mesh_oom(dev, apdev): raise logger.info("Ignore no-oom for i=%d" % i) - with alloc_fail(dev[0], 3, "=wpa_supplicant_mesh_init"): + with alloc_fail(dev[0], 2, "=wpa_supplicant_mesh_init"): id = add_mesh_secure_net(dev[0]) dev[0].mesh_group_add(id) ev = dev[0].wait_event(["Failed to init mesh"]) From patchwork Mon Aug 27 21:28:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962646 Return-Path: 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=) 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="WwdnvxFA"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="ZyU4KEUB"; 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 41zlRT6ZtHz9s4V for ; Tue, 28 Aug 2018 07:30:29 +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=hhK64FpNBDkOCics8KkWtO+JiOLl8chtes6/f/C4Gqo=; b=WwdnvxFAFWxWqv O1WMDTbs2yNuD7CzVkAVyvDNM/jqaCO7g1fuGyFiMhwq0/vbQAvaXYppVn4PG7kTnD3YjPa5dW+0K olFe78wawogItLJBSTHgFWizIsnIcWYXEB0E3qBsWjlQNE5aPcRvDaETFvGvZhflx9kEBsJ0y/XoD 1ZGQFFZPxP5qPO8RmNqff880F1AlxgX7oWR0giYH1jFxnBFTNckQtN7Tg8PDkxjnf8qOoCqJyZUH2 RD+6NXIXyaTF/MQ2JuQ/HCJ07OUGwoXhsF/S64b24p5E9gvm+kZ1SDS7aWIBoE44eTh32CE5fEBcq BPHWz64v0PCnm25T6iUg==; 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 1fuP5T-0007Ly-2B; Mon, 27 Aug 2018 21:30:15 +0000 Received: from mail-db3eur04on0603.outbound.protection.outlook.com ([2a01:111:f400:fe0c::603] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4b-0006Qn-31 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:22 +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=ExYmbPHDBSFFQNG8Zc6PrBaTPF4W23T3vLZsIm0p0BI=; b=ZyU4KEUB7Z2aEdrm2b+lWX953RvJH8K1KjJy3blntU2b8C3vgMgPGPhxzkM0Ge+HGiCdQp+85rH/I5RZjEIYPMPG0VGO/HrLnj5sjTKqjh/2c+xNwQpgaVfc1d0gADMEYsfxKHS6HsttzX30Bzb2aTydqXh8fRrZMWKWrdIfbwA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:04 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 04/16] mesh: relocate RSN init function Date: Mon, 27 Aug 2018 14:28:37 -0700 Message-Id: <8cc17ddb599a3d2d457d53255cbd392be3fd95c8.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f98ccc03-6bcb-40a9-e996-08d60c641da6 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:7+K/SXdfqEs0I9H5E0Wuu2fUGgrOxUgzFCEO9olAmdC2XmGdIyXtq/ze8sYYyGj2qOGvEPHFS2rE6LQRfX0pMabXP8qWTG7V2up6h8JsqK728Oyt+87UhbBE1DhEIYTChZGHekbdvN8+YmD88FHgMY2qiGDLmjJ4tQonHqA85CU8XZWGf1m7njGwcQCnSzdXGSeoFn4nn3YFIbkq42KHE2DvVGWtI0N89+Mvy5+NXEzzbzfsf5qGmmoj7LpVOncq; 25:hvmGltP4dFoxdSkYExT0vlw8nyVUrWFpLnQ9zKN2E8bzM4ZsMVdz3FSm8mnOTuwwy8vU54zk/zI8sGXQspyVGHjyeRAaB7jQ4bN+fVe5rmDw/qQLmrawf56J8/7OvN/3xuC2WjE71hWS4fCmWwuSvr/sCEoT+asb+WE9NXrQ5UOV3LJKhIwRq5Kn7E8djPNWvPc0nLLvB5yJkxf3u8FcRYDlWe4nYwD0XN9e+D9zDq4E6tnZRhtp8NhPzTCLSbmxmgzFF4B+rHmCTO3huMYkj/V34xlWr8P3wgCMRaYMcPLuedaIx+PVFd9smkT5P6xbM1rhWkEX8JsiubFCox2WNw==; 31:6JRUQv+FbVpjn5oUIiceKQVN4SyHEVsftnmiUigOOH6cnw0Z5ZPoIih3UShPvIn/tbbQT8UXfxmJLdNvf7rdBlrFdJJRharHq3b7441NfkTlQUwxNuuzlS9MQI6BmxjXXT2avyM8udM40y1JYO3lQBL3OJhjeGJFPAFXyulIMOzo+Lx2aD4UBvCXDWFFmiuSLSb6rJEaM8OWRbCwnDojhYVAAmHMjXTsXUG9np2AySs= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:j81Zy5bXDCgv+AFpc1RBUSV/5gu0cggxv9bvzv0nomxe0m2l1NFIiP27V3f8aYn9SfxUHM+L9Z+00voKP4QwYx54oObxMaDPaxTv9RuhSQeDO3AOPxxwpBmuJRWL7GVNXAHSbItk3lv8t6I4oInIBBezaGYReeoyi51/eMk1dSAqhSmg3QrcMnyqVaUzL9H75QDLug3kwQ+vkYRHQ6FgEmWubjZ5MVSDMKi5Se3mGPrqXrhQaMPDHD2O/C4F1Swmy3Nw+uc3wLd5C6Sxzq0YBAOQ2NoAZQSg77IbFgn4mMfAYFnUpBCD2piEFq9gkKQdqRhBciiV2tmKhT9xVdROvbSMXNA9u2oKulQ3t2RiKiDgdXsggJK94nxa7CA3nwQH4xw+mN2Ktm/71yVeYzLSzBwcQK5ixLLyctfGEN0AiwzIaDpzD4z3SdaIA5xI7HxIR37hZHntJz1vFDCTjXMkjQZwtttqjQdDOPYzWI1XAYhIkJJXJa5PzYTLn4QkD/Yg; 4:XDm5eJB5+OulbqFXueFB4pZUm6LkS6ZH+M5Iq0p4vXSIaicOx/r/znY6zLWdpUr6/sUQDXx4XbgnNuadbihFxLICHXqHS67UQLvPWSKh6TcseI9HlHkn7bkoWzXu3x7YsKSI+r5wbyZxfjkxXMu0O770xtrDeU/bcQb1K0gVbx8N7txzmwCHeKAwwTEImrmtX95/judnBXz7v6p+wCWzfGm8+N1o1T5JnSMvQWYoYu24zO7H3uQb5xxj6I6P1IsjAPbFseGyUiUaRqy4F5j0bg== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(3714002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:INtYv5mW3Ka8Nteq9XkBNpG26JT8ARkrRBe8LmWB3?= J5nAWAvhdkKXPm4oUmOKRPs590/rLnb5wTjNSiJ1ODsR6OLdRpIq4elkk9BPstLKwrkR0fQaoOac+eIkRiONlb6yXl9UjZC/i0yAJTyvG1wqDmksvdc1JIzCBQIk+Jk9Kn12xrZHKafNknghL70CArH3m184Htbz4obUxfc3KpnQoP2bDmfWPB5dQu0avQG78bTuVfI0LK5ZTzL8qgDYmiIh1vPctWqHVtcEx7q+cqxOh3qWv4ESRAcckOtvJkz2MfIWvoOUsfEvIDkhBW+6T24ZD8gvj0R5Fj4cGbHnp4Q1qr4Jw5tI9EVZkcUlq7Usl89pIO1C4jsHlXewjUWAD3L2DSLhg2I6YNXi6tdkWNC3qL3bhClA08KgMFyQCAPo484KVf050jT6Fve0Ut2BjbCAfqMvIOqJeXdaCc8J6LDI2UPlAoVyayH78KxEoWR65xJNl9Odv4rUs08C8UNvfwXlpy3+iR5t9/VMM982LAp7e2vVxYK+fO7N08zeVm2CUEfo/Iv7j7rYEiUZH7dfizm8YA06aSzbcxz9+8fYn/E/SLWusD6/VlmsDnTfTW/u8vPxuoc9zbZQnm+PfJLGSHVhpJBH1fSkrimtFtwP3V5ZxEtfa3lKExS4EbhNv9ePWLJnB7D8AhRfAXS74QeSRuXuxUxeFIanxxyTIue8Ks0DyE/ii6E01xicjCLcnbszrEzyxWfZAolrGP0MSuE9TJSP9taqlh4C/BwkJNHSdWDYYFED2XQR4DXlfubzXFCtbM4KxSN6xWkJvXzec1kyqJCBrhY1yZjlquxdtyu/LgcGx7YXXaS3P7dJsJflx4fR8Z0bg34PaR7eoogMvrHx+ggMc7Qy5pPzJFbbFgnp4dELWJDTk/YX9mTvi+LN5YA5zN0lBndum0l4mLDaPnG/Kxz3stjOh/G8ErvOaTIm+8zf6VO5KPEDXtwi5sV4EG4siHT5wY+c5KXI2zB2APHv9shlM+xLn0ER7HoCFFRfjSlXMURdQXgDSe6s7zblsQFAcT+4BjLkmke9+6k4wZXKawHntcRVgNLvn+NLiMzr0tcW3xdGLlxYA9HJxipU0WCcl7Bjx55C8p1LE6M5DFt/z7gL4Kv6FubyJcJbvixXiqfqD+zviDpQ/V1zBqtNGOR4lv1FrS7WQJgaupn/DA92EtiTcQg3l9RwYmVMgwU7lmIPseYNOB4T9GEP6kDQYo5frTV7aBNDAM0rJFCtMrylPDtvyw2gGzQblQNijVSod07j2k5gwhkyGVm0TyV8Fcqdg8IqossQpAXn2wtmmwkILMNe4fJadNcFc+MIFt6mieF7P1DVinwm/j921eC3jrcM9w= X-Microsoft-Antispam-Message-Info: x4uKJkj3z9ydlE/qLd2BHYJKA6NEVnj3zZRI5zFDrV8I97w8SywxlOvM6ORcoLEwPcOezTRzPp9zYwBxKnVjXFLrgvN1lLrTuX4ceEVNW3hlB4d/+chI/8yaOXHtA9BbqlDzy8V5w0QFwhSAWcW0A1yfKqwKFbh2Yf+tvUtXNmG/ZH1SoKakEQwKfKsx4weZ+M0ujy4Rzhy8oaopzhDx1NdKp32dZxMiDphuqNhArN7yVQx3mionq2B+tk3e1pnOFz2OgGi8B8I61lVfpuArWqpaq0nhnNLYrSikADBkEhmOdQlmm8SRAKwC6ByNaIYwgIrI8xJAO+qJfN0aGjiMZ/wKiA/r3J0eV//UYnLprtY= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:JPsk2rZ9+kFHFpt3mqYuezfDbuucEbq3r4uSb/pf7LfBiPICV3sJQeQUBy2o/HqiMC/KmEB3NSn1MfX+zxVzdb36p65FEKK18SSG8H4LTxEXkKz59CogKoacxryIyRoveRV3tmaBPxM94U/8ctQWUAiuVVedbniDViHfTO/DQHiqEm7RSgU6r3O0OwVWH/WxA2BV6r4JOeAR1Do3UNozfQoYLESdyrBsnorq+VbpWrpfoLy2NZzCtmNVtcnLSsa5RLvoZkai0v2BPc1jH1/Yye3oVfGTOvZHcld31ngcoYCn1bSkY40cmtG+xo/yNTeWgNmghDajshG46iMB+x0GTMgLBCSBTl4w3yS+IFPmDl15fxnoZuy4/qaaYtriC6IB/pQejqItw7Ksyd+wQLrYY9QxG4FZjDEFbvTLOS7/YLcYjB9k7RjORQIhdT++Y/oSxOZc7eDZlxUZNo6sooF7qw==; 5:6BghQKzTkn5BFJT9JjGciwAzyVuWO76DHekUC4cAqydcTdR1x8hCmdq98VYcxeG5AyaTKAARkiRsFfidWljoT/hOnjd/CXU/IZwD3ImT8LoTKZ9Tn1JBHwHikabFtrJnfitap18FxbUF+miWPk4+9L2PQRZMDyfLYIlyHKZ06lU=; 7:W3rjXaGXiNtbQIZvz+qwmceTXQRasXSQkUUix/UuDbv+uKSOMyMKlhHyRIpS5U1wAP35tGuOzO6oO6HcN5Y6r06YvEGt/Jr9sFf+gV+pxR0ndx/82KcxM88c8E1Y6UXUTH7FndPrbRmMRkvKZFQm8nPioSfCAaXyFPaqbyClXorS7gG7PlpVohCXJNkZd2cjII5U4ko9XF32QxEIYi1Uy9pBBXb2AH1FcsftIOBJuH7dndX6sEZC32TtVxZaL7Sx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:04.6600 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f98ccc03-6bcb-40a9-e996-08d60c641da6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142921_152438_4A8F4084 X-CRM114-Status: GOOD ( 10.61 ) 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 [2a01:111:f400:fe0c:0:0:0:603 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh RSN init function should work together with mesh join when it's used. Since mesh join could be called at different stage if DFS channel is used, relocate the function to mesh join. It is still the same call flows of mesh join before this changes if non-DFS channels are used, hence no side effect will occur. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index d126087..0740dc7 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -203,6 +203,12 @@ static void wpas_mesh_complete_cb(void *ctx) 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; @@ -373,9 +379,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; From patchwork Mon Aug 27 21:28:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962648 Return-Path: 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=) 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="JtOw79TJ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="kLB7t5++"; 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 41zlSV3F4Nz9s1c for ; Tue, 28 Aug 2018 07:31:22 +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=XJq5QFy0K2QdYvsWQMmA5ylPBv1jfgUrAIil0dhJlVY=; b=JtOw79TJhBbScQ UkDCi93zTjiKkNBjSDZAiomNxkJeqvcREjKvPamYfG0kVpHntz8Y1/Gndm8PCyiG4OjNq3++uJuS5 RDzo22y1a+G4PUQgTGdvZ5tjc/iYHX35FfmUbV5A5MAg39QvnJceAHHg5W0/K4l4DE9BUMcvW4cdm GunJot/L/pLnkAyrlyBoikavwVal5+CyjThn8+/aPPxk4Ug6pBpzmqci64SHC0pfr07j31EAZRW0r Px2sQogljPWwOfgiWD+D6sDIVBPiXvhFWKi/oikZYlhzwf6kWhSqK+Vbcx/eEA6B8nHqRm7WHHd66 ZFNzWcXQU2n7R7n11/lQ==; 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 1fuP6D-0008Ud-S9; Mon, 27 Aug 2018 21:31:02 +0000 Received: from mail-db3eur04on0603.outbound.protection.outlook.com ([2a01:111:f400:fe0c::603] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4d-0006Qn-1f for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:24 +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=0PeyXz2isNKE4l4YKNsbaoxOoJx3KsD2Z+HnLkzGpT0=; b=kLB7t5++cAQKWNIR4trVOegeNv1e15WCwCq9+m48b+tjAuxZ0repQLQ7IMSla2PMNsgJ+DhIwi+YIwBmHnPAPoVo4UDcwnW7/YWh33UvOeJn2bS2VGaF0dgPbQiPsnwWK0Kmj0jntpQmgNA3Y3b0GbA6IY6qxE2i0Cu9J50uLSw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:05 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 05/16] mesh: use setup completion callback to complete mesh join Date: Mon, 27 Aug 2018 14:28:38 -0700 Message-Id: <7753a01a155f29529c5c5e5fe8c237418ddb9bb2.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39d4fe93-1ead-490e-cc8a-08d60c641e58 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:yJP5Bh9blOVOfwdx9U7FGKRh8oz8ijVQE6F8cbcAAdyypQBCQpcoKWG5Uc9lCRa5HmU8aYwHSYBNNy9Jseid4YRxRpKg1nw5yXqfaezCnAXscu4LNucx0eZx7thgMFpWj7dbZMfxn12G0QZB0okBIFZfWhWnuHWTcKLV3/Ryr4zHxs5c30YuJyYyb+gD6GziDcsAFNIPMj3AEVQXR4SpikOuIy7TkWoawkBAVCGd/eWn0n1gbrBBqf+4eLHrqXbj; 25:9t0BnUVyU4GgPgMfk/XNekfRwArI41EdsjYnXxGc9hrOzbMg3c8MtmB4hBP2b391TRb2NDPSV0OslUOzJn57ZKMK/5FJMAc60P38GOOP+UsPsUaw8/dtWkp9KZZd17QuEoTpoxtzqd9tgbJH0U4sXA8VnG3lmojP3x3y9Y5dGNgg8tUiecRKGTexcTCcMgICms5G1ejQtjfrJVfGM1JmpBegvLSFBVGMxZt8xN4y1Qti1a0+sZJH9km57zwmmgnAp41k9qIZYFARDfLNoWvxjJeW/Iy6bo00U7FHDGrThZw285RtUVJn7mWvUfe4Yn2zNZ49ASKTsa8wILZ7t/9IRA==; 31:DojFbBPVazonDCDfP09icrxinZ/y8ZxOq8PlaX9UctXvrf3XSzdJlbCuIJPS2EyoiGFJA0F6T4fWrZkbRtkuIeDQoxVpK/49+ldlnhrBgO/R76KNCPMN0o4PkL6nUY6LP7deFeaTY4KXa5aFtxjsBd12mvqLzkH4HNonUBy8gh2hDEbj4u5z5aZZmVdIXQX3BYWNciqChm274Wxn+Ho50W8S+2qixkI+q/DEC+Iq69I= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:2UXSTa7LvgZIAJ2XQ5rogjhpEZFzlCXemoMVRDOZzspz9X6346M48bduUN2Cid5j+OVpVakwe6eWQUqsybjDlghYRmw5lX/3eDZZsj3I1X2BrhgivyKGruymQ+JIuw/7ma/+mgrHwSw1liNW07ZMxh/aGPFw++VJx7ZsZz9/qRJfQ+qjbkJRVEeNrbgPWPFEeYbBLSVG4ZUG08mD/UCEE5CDMNp/QFonaiWW7ppiidjT3cRxqhJLRVqy302l5ujBk8rNQXvb1ZFlVZKjwhOveE8BCHhPcySrLAbZ9nWabcekAJn/oRj+Xlb3HTwL5V9lvR3v8pX0xF2GofdqKQw++gqsDZIbYJ0IbeXOteWUODmIuujM304BTeHwmBUJjcP0tjgIVBdb9/xPUe8p7QF1V6oaI9+DhS60oPrUXk1zPcSuYmsoVGC3VwppQ1MlhTe4byBFCn8zgnwNRdTf73o4VKXrbRPYqYxtZ0YQPmizwlnccOX9J/6g81nKS49/dwLM; 4:qK53ns/JSZ3yAhGHVRU3h7xQUQT7knYgLBrJ0+Vr1Mq8acUDMJ2A28GnZSq7QIF8MQD6PdYtJcj5io7rDcSXBVV9ENPh1WglyWRGkFqee9vNDINmOwLl2jxLFqrs/68ikFMvtBywRtK95OB8rExhZvhZfaVPnyvEDFAC9tcf7CfES7eRLlp3Aoz8nR47rOfFGrjipnV8gGZ+djMjT3Y0VGM268qjX9/Y6aByuyTzsGamo0l9/hxo+x293NnxcQZvxuBIhjR/CAJGQoaJD6BqDA== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(14444005)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:PRrMT5dzyZPwzAH1oxHOvvfdjKlhK19G4mAQH0FrT?= 5mPYFLHE1j0fSsz6ff3IpFmXn//fXgScFxa2N4pW5+1/3vWlnO1t7+d7TgN3vYB3kTI51JZIVzaeml/pkVKiYVhG8ZjXkR3JjIf9WKSusPe9tnqsv0CMgy6gfjnugQcgYZKPqxBqk3wu0ET19V/jAp3YPxhKqMAgVV94moFc8mUn6W8z1lBjEJe0bErxQb7Y7Xraq0kpLEwlTe4hHP4/8Uu5xdjmSfwR+9HnoL2Xnsrvwa/bf2v3x7jfKifqTCi25hqagh8+9J3C7aHxTX9G5mQ93whDPQmEzia7FsrBOpArkTzm4+2FTCJjJYohH1YPYZwzx3i6tGK01P7g61PkacUPcAsXnX8S6mPu3jFHykbrC8ndmBYltNg0j9c93uF4q5CbrA4zahnkXg8z+vojCOExVxrZcMGKFLNsptY2VDy8hiNH7z9KnlP/nbLtsfKqJIEKgn8qTxn0sOFQ3kSIC34nHgL/dWbX9Gug2NLj5RmbEgY3gYgCitoH/QgukeArOB8EfafMvLFab6SiD6NRVoQ7AgkcuNDxi9qry6EN+gUfIh1OkHSpka4m8f3p/TnzlOGSdDX2ZONc70s7PL+BUGAme0dApHgdUFoUHjCeGrirN7XECZh7U/uArhmCiYsxP7r3r6AE5EgS70EVC9itzrqse7dewyJsRIogFpr4G03m6xZurtCsX/kPASSM+gR7BjaqqHZmZWPPk+uq/kQJrG+r897XirAyHrAvSLEPvvsbySqvTRHFkNHYgRy8L8/o+Pk3KzL86V+3V7rEelW7lM9ZTFIu/l4y2koJ42BVKSwVs0zQojXx7Tfa30EHvm1TwhADT1GPAsR7NphCkBGfYxGKEMOOWIhTVdBxcJl9/OJ+FV4LzxKJM986NMPoy+kvOg/ZcwKpbG0pcv3Gs1yn2b7sXqLaCBByD+GhQZiVTAu6iIA0fshqNQ+kXpvJHYWgSu6S6VsdHacoieI/+cJMCdBJxhZ0DhrzlFy2z7i9sYM1CJhPlRc6gLiWEpTKpeMTNd/e3tCERDNuC/NjEoTuhy0VRA7mrfHba5VOEh3fE1Q5pnm0mZEmMspk5O+9Qb4ompLYxGskjBKsTdlcIZHxbka2DFEhrXldXGxbOWPMLD+/fzT/yibABrwOKoQGz0v2bd/d9t9LJ9MDy0YweLkV7rDzdFg8FKsG56ge6BNJC4quDV3QXaXiGA94xlm5RJZL94gPZhuN6MzrOoJa0WDv/Ze6asNzkCBpwEkV1keCk38T7vpQFqPh2sdnawtepTjV3RmSkUbVKZjc9IPC9KOUJlQPR5UJyrD72VqgB81vDIdbU9AIIX2l3hlzivYkvtntrk= X-Microsoft-Antispam-Message-Info: m5bGPJRwu8/Lt3xBKdxI79cnuNN/fxAaC7vHTtMI/NCfgNgmHJ6dswnImeA8QY7Z1Q+b0Ea8f7G4ZE7hxhKms/K0kWzGej6IJVcz+Z3TxTpUj3xi+PeQRRjis9cG4cCZvU/yWMt0/ZRfomem9rHsc0udsNv0NzwYrucsdgdV0BOMDEciRvmuV0vo+nUIAawMraJB19/AJTtOWX2Rn5nr0PLnsUJjCi3t2l8SIoBMsPet2uuwgHV58qODjNdy1REyJT12PlUQRnNWJoSnpQV7v+1wpHk0pCC0Mm4A85LwzeNv5mf5DNcrCAkfDmspPwF0UL5CBLlQdyQ3qKQUMpgKHwJUM8cYCm24BI+GCfZ3SnA= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:JrTVxyZkJ4Sxix+VdF7fGK9AbsNFo/jORu9w78GXqfDvzoKT5yb1Wbx/LnBgHd8mmdNEv1EVuPaFMj3OjOzQ4mwZGHXszwMQuBR9DLTmw4Xo6Y6TylY+ef09n+ebnvMcYh6xXXDYkkQ4/I+Q+Fqg2ct0sJ6yCSDMIeDXlX3Dr7EACJqMrNxu6+CwHKBq7yU0kQr7FveGeZm1ZC3as5etnsffamTbhe6B+FIRrdcO82gebdoZi1X1sEbiqtHZDcqevfnL1WW2iLP5gh8YnclhgBDolalg6APYlLSZ2bF0p79cUsrhesYOa7SY/LOESWzw65vpUa2i3OaAZ3iqSiwyEqwESfJtK7l7UnruycQu5Ry1ePXcc6ndARazmb7EdHky7LjaEWYqt10In7otR6ueWZaV93xcARkw5FAynAM6+a+YnPqXjjyQ14It9hc+Hk0beolkt7oL0tnamKTX3v10AQ==; 5:lbeiqVb8AToBYIJp33EfI43duh1Fkq4LKCt1v6BHjDWoaqA8KUWHbkKYBVEWN0iUffABdV1NKijBhkNEGLejCNQE2v8dJY1yR59aVKZTgM0eB0q9Nt3MLPC15BqtS3l2ZqgB0N9aA5B15HA/XkfmQR0jUV/jFxChFmK0iu22t9E=; 7:QzvWQkvvRx9mFuxILgo/fOAa3OlteCtN3fwj4ogvoJgHOO76X9TARfNbeatHHDiuvVhTBedEfXacMdJIUyruMYZ+hmUvaBm0nIOiB+vxqu1VfO/eW5hoZj8PjSu+P4C+4Ru+Z3+7O0aFV80k324V2rFQU0wUKsZE+eoIwekJ1VCHfGlMYoZzpDcEaSPS8dLagyTEBbXQWemLUdZjxXltcLdAxA/zVIqsGKV0DfTVyE2j0jPEIpcIbOVA1ATIp1jf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:05.8248 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39d4fe93-1ead-490e-cc8a-08d60c641e58 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142923_134765_651C0760 X-CRM114-Status: GOOD ( 12.55 ) 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 [2a01:111:f400:fe0c:0:0:0:603 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh mesh join function is the last function to be called during mesh join process, but it's been called a bit earlier than it's supposed to be, so that some mesh parameter values such as VHT capabilities not applied correct when mesh join is in process. Moreover current design of mesh join that is called directly after mesh initialization isn't suitable for DFS channels to use, since mesh join process should be paused until DFS CAC is done and resumed after it's done. The callback will be called by hostapd_setup_interface_complete_sync. There is possiblity that completing mesh init fails, so add error handle codes. Signed-off-by: Peter Oh Signed-off-by: Peter Oh --- src/ap/hostapd.c | 11 ++++++++++- wpa_supplicant/mesh.c | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c index 23d2720..243a576 100644 --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c @@ -365,6 +365,8 @@ static void hostapd_free_hapd_data(struct hostapd_data *hapd) #ifdef CONFIG_MESH wpabuf_free(hapd->mesh_pending_auth); hapd->mesh_pending_auth = NULL; + /* handling setup failure is already done */ + hapd->setup_complete_cb = NULL; #endif /* CONFIG_MESH */ hostapd_clean_rrm(hapd); @@ -2031,6 +2033,13 @@ dfs_offload: if (hapd->setup_complete_cb) hapd->setup_complete_cb(hapd->setup_complete_cb_ctx); +#ifdef CONFIG_MESH + if (delay_apply_cfg && iface->mconf == NULL) { + wpa_printf(MSG_ERROR, "Error while completing mesh init"); + goto fail; + } +#endif /* CONFIG_MESH */ + wpa_printf(MSG_DEBUG, "%s: Setup of interface done.", iface->bss[0]->conf->iface); if (iface->interfaces && iface->interfaces->terminate_on_error > 0) @@ -2174,7 +2183,7 @@ int hostapd_setup_interface(struct hostapd_iface *iface) ret = setup_interface(iface); if (ret) { wpa_printf(MSG_ERROR, "%s: Unable to setup interface.", - iface->bss[0]->conf->iface); + iface->conf ? iface->conf->bss[0]->iface : "N/A"); return -1; } diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 0740dc7..7b014b7 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -260,6 +260,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, if (!ifmsh) return -ENOMEM; + ifmsh->owner = wpa_s; ifmsh->drv_flags = wpa_s->drv_flags; ifmsh->num_bss = 1; ifmsh->bss = os_calloc(wpa_s->ifmsh->num_bss, @@ -277,6 +278,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, bss->drv_priv = wpa_s->drv_priv; bss->iface = ifmsh; bss->mesh_sta_free_cb = mesh_mpm_free_sta; + bss->setup_complete_cb = wpas_mesh_complete_cb; + bss->setup_complete_cb_ctx = wpa_s; frequency = ssid->frequency; if (frequency != freq->freq && frequency == freq->freq + freq->sec_channel_offset * 20) { @@ -503,7 +506,6 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, goto out; } - wpas_mesh_complete_cb(wpa_s); out: return ret; } From patchwork Mon Aug 27 21:28:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962649 Return-Path: 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=) 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="DfNUMVTk"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="p/iVXEjW"; 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 41zlT35Bfmz9s1c for ; Tue, 28 Aug 2018 07:31:51 +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=R5/40LTVwoducc3nJYyTIeAxYqApqMQOJVeqZSo6Hlk=; b=DfNUMVTk1lnAjr cuhP4WN2++JknUaT3Bv/n35vgR/xUpAefrclbGXy1RGBpR0O/zA+BTD4DBzGEFxmChV6KPgwJjPVb CYkjLfD2YE5W1j7Lc4sXb7osvEsXrrOCmGnGfCqXbFRi3hWDk6Trj83Xqu20HMJyZU956ugYGcIAx FkK/SQI73+SyDoxzJ5TWu0VyCJ3JQRg+YAcr3K7cezlTNw7zB+ZXBeUpnvDK36pkMTkBY1cWLn5rA bl4UFu+lVc8S+7DRWet1PLYda59slSlQD3YT9MYLxc1KiGZIqjoaxtJ2G5h8JbSwxYEed3RuDGYTC 2GEfUgSJq2uFBlCgvTEA==; 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 1fuP6f-0000G2-6u; Mon, 27 Aug 2018 21:31:29 +0000 Received: from mail-eopbgr50084.outbound.protection.outlook.com ([40.107.5.84] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4e-0006Rg-M8 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:26 +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=Q4OMwvO+bOoxCVPT7kCyWP4swXpJtdLWcgZMAhZY6I4=; b=p/iVXEjWGAWft835MMWRp1ctomb4HBWcknat0+vFUdaOX7/rdr0Fhr5kjJUatvET3+QAZ7veheA9o77WpMamV1gCvPIRVQ918hBdaLSNpdRTmocDT/yq5CvliXIEA6QHJp1/ydHgdcHWBrWH6/Lqw0j9bL5SE+NlVhk+yky/jic= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:06 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 06/16] mesh: reflect country setting to mesh configuration Date: Mon, 27 Aug 2018 14:28:39 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ece2cd2d-d3f7-4f59-342a-08d60c641f03 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:x0eFIgbvRRfHAR7V/LSBn2iSGTvaBIGxyWRj8q8hpR5rLZTVOPQkwwaJtRArVq2e1OAvKUw5px5DGWfTUCRlFE0T6Lakdvbf/SeElgzOzdqPhvTNvo06T3rFozOzcUo0p8xwISfJbtUyD5uCns+qMIh2iWxUVfcvMTXoe+eEFWimIDERbOEc0XCb5GN1MBEVwc+sRIfvoinmWse9jWTDJe8Sa9Nme/d+/4spBHMoaoIhfbBfwtptmnpStpI6sgYc; 25:uD+GpV+2CZbjuOPs+UTwbBYiB7UPja6CMlcxnTgVM1iLpR1Zu06NdRPW0Do1VECFgWmNBQBa7h6Vk1zOxtiIz8PzmVc0146Pz+SfRAk65/YPtDylDRX1BswsGjsU6AGKdhNipZA/kCzNfYrfX1wplJ4b/DobwYAo+7jTHxfw0p8jFxHLa/aUvg0fWrq6PT1zJJNBNGETde0MQIEEqo1GEmPeX+Y1TwQTjG7zvqvBb635pszn/du1uXYTNzybysmE6A5UQwvakspOxVTs6NmpJjMVkEaI/dgQSjCBoX46kWaLLukcd2+8fBsDrgik0qrkjZxMDBkrTMUroJ/A5ms+lw==; 31:mPvZ6SC28PeE6Zi3EDi3PE8/8Ti8d6zprSXrKAgfrFJ+sZVfHLJ9vSIS7aK0hJWzZ1uaXS2j3I47uSJfD+x3xCpGSuwGqIXFcGLg0nLP2nl+v/cdNxujYdgwIfffgiMWMRsS0PQiKPFJd7pev8cn2QeUCucldauD/n6EQXLPiBit+TjRA2k5popI7inrMTAHbPo8I24HBtdYS4XLMCtCx0Ta0WYneTrQrSp9W/tWPkU= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:t3LrONQJ5nOcdR/WfXB9mpH4+7RsvmVQJWBoXj9zZRSrWMZRUTo1t7XoboKQEnqvz3GQFhApGHtPZqFqqQ3fgEbmsR5Viu6HpRKtxyEDt6v2SGoGV6Fy4uVFPm9ZEf0bTFOHgTjr/4iL75Zk6VyiDunfGTJH8qbhNvz0TWDXLR3moMLwVYaRTZ3ETQDg+aJP23qwPcZ2vaapIvFbaFhz1UJKZ+UgV5xTXDEYMAs7uV2SEL1xWuuLhxEtaHc9iOPXqtnmN2QIz5cIfJIjqp3RhVJdseUMRMb7Sbuu340VBIMXPPI0fHY+KoJnGe3s2oX5kl+PizuSFGW4U/Ww2OVBTlesdOqe07AEbe8mpkQ1pdepTqSrAyhrhU7laeSBczlVxAtymeiQk28UTNYTOERsQfJuat8Y9SS6x+x7Vv3w/KsfdO65BjlMUg0bHbbv3rvBzch3XHteidFZV7ddWV1MwfhIm7II/sU4rDBSPA6p2OIgoWwMnyCWr6BSIu789vIP; 4:mIug7Dyf3BwarYEsfP76Y5LqTGi8/dRyN3e20umn3kqrfT2VqO84Sx40iQh9SjPrBXv6kDmE0QB9piqksQVmtht8C41lfdTuHu5HGTvaQ7c5Ji7/T2uhw8gVUJmpEkZPlytyo8OW9oqovGG/4+xKullB5UHliRSqACXKgLF/eoW5Ts1AphqDANthKzcgXXpysYBHYDjxb5MvPdszp7/gcxKoiiP2FlNC9rpAa7LeQXGU6ej2yJKK9DcvITleqVXls2YTbI7aHM7GiMrzrFBxTA== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(14444005)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:wdAq1W0cALpLlvy6g1LtmVejVdqGW1tDf3RkfLxoE?= pQL7hHfKbzi1PVON7E5UF1mbJ6GRvc3upt/+Rc0kp0Ffdl8ZINoGn7GDv4c1nZrKSQoWHRvMTbyCOqbb2a2rGQ4Q5ooar9STnXlb6lurqh2PdV8RFd2VxXFgBGu1EOQLpz6nCroH87UeHvtVh4YhCR7VziBQ7lBccBPGmftVVbPn48WrpWAzqLTd8h8by/sAwJAy9lnbSEJi1Xl4WTWCtffoZrBcf4XCOyYYl7T119UCNagV17Iq1a+sZyC8o1LG9BcXai3uJ6IjuW7I1ijMZ/Ak8zPlQKKt/daWt3pzn6GLYBKI2s6lbntSqWomQdd2XAZTfflRJ9UtzciuQbTVsJyjrIWODzlrNI+4HN670i/zoW9A1RnmQi+2F89EIrUyAasoOG5xD6+EWVgGvWUmsVAD3582K9glfvX0iXLWN6A5tYq4Pa1LRfFwCNTBak3xvjd6nH6nqdV7kQ0Dlrbg1I32U6zfUBcYwV86D7hPn33D0lSGRXXfWD5r+u6TGeDlLbp+iSc3Bbc7k9C0XCS7OwbSaSvqljW1uCNl1oa95YYrxr1862xLMWYTQ7ZpmEDl4a8NYRyjOCpSzsZibZOElsN/oT+af9nirNzd58waemXxLLPDKIAWojLcxErOlX5+R6yaAhPVUAnc9kMw2STevpsQoBhJpaC94tTtIQP6AKVLZO+GGz+am34CgRz9HPA+Kp0wXGNGtTrAnO9WLdwZxszHU683lXEVrgqu/7xo/Z2j7XPUz2tPVmIlrEVd081tjgTRnCoyzBnomadYhgYzHgc372qgJWQ/AZn8azzIQrvhT4BoTcwcpSnKfDcKWlgmozMUoYatLijUMG1pmK5LOoMRKhQOkQE2zjiZwXORFyGaHpkErnERxJw1dF/ykVQER2C3AgZOdTlBvEPBEKJ4qOnnT2bFoJy4f984Bt/uL1iKsoTrKav6YW6Mp6GaPy6R46w/JdWVTFAtgtbiKpYNMrcpPGh0hzgH+LzMSCE5bRdC3wkqu4dqbjWJQIZXyEAnS7+7c9bM8ufSgx/W6wW2OVvmNvu0zpxtYB8HweIUk+QrXorywJTCP489HVU33mvu+xdvgtCJA57eY55Oy5JBsbQwAEVOf3mCIT0f6YSHwGFMZ0QW7WNb6n9g1fVrP7DqarFT3Y0pj9D2yQ2k0ut5Rgunwsq+bKHmwlfWecSHUj8NBedZO1LRfpe1UfIFc6jElFzd0uUz+yWd36pI0AFuuSQUZRpdFYjq4RjEOQ9nXa8WdepeqztYeaIeh4F5lWse8IUIbN4D8gVV3Zd8jMDm5bjKUw3fM5C52/i/Jyo3H0v9Pd7MjJNIdDxvG9hgSr+1qk= X-Microsoft-Antispam-Message-Info: YH6VOUJNU6kKjlHGY+rI1FPNKwNHWSn9/7cjd9gi9bPcOUuaRAQB2AiPh8FPkfyt0/IJ7I+6EA1svpJ/9q+vHb6eetqdHaZvJOrjGcyKHkfLkLkA5PAozSOmUWH65zg4w+jTp1T6539w9pnloHVVM7jypp+M13GexTqAssJVGduVy0iTi8qkSWqqZ/fGiuqfwQl3eADEQF7rd47YElQd0dfgUzVkmQ/I1o1Q1fcpuIctWRLEmDZqD1IRP2cB5Dhnq++IY7nLP1/GGv0vtv6JjFpUImIzI+GD6FbxsFK+/b3pZHdOPgQkGjgi1EDJV53BMhWZdheIxBnHokheCkb7nZ4xxIOYHzhYPlK1S6Pd8VI= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:aqza6DziXT0F2wwWF8FIxjrYR4eyPdv2y6tvuHcA1e2O5IBQ4qX+SJsjdixcguBR7QoL+cfeiauM8l9RMisahYxRyVfi8W3NG/l2Adi6WpDGhAmDkyqdwsn6i2nYilrVlFErtc8LZundL0uoovhOZ90J7Zi6hw+atlY3093CJ1mwRgtxP6awKhzmupNZvZx05932rTXdVF0cv1RBBWa596cBRYkyn7P3BQYppa2k1P+p2tzKX6mm67eXkf32NMfcXYq+600YUCFSZW/AcNmC7tBM6+DBglbVVYnHXrsoP2PvoATHreCcvsciy/sMc7MrTHA7mFLA0dSluaJaTcIFZX+dLbzUJ3u/vZ9cqnhg5zZWNwwqZBKM/g7deQPgMsS3zJGdJy+tj82Eq2VSucIAFz+D8gM8KSZijXXTsDP8PEOfe5a7MjWGPl8xAj5Ia2pErCmx9xtIMo1FS/PEUr6ayw==; 5:ds0ktXppAVH1Il/1Snaak0Df3oZhH2av5VJR3ZVRGdEw5359TnpYKoEYRpiMWVvEfBfYangEXT2bKUzyhUuaCyhwB5pgwUQM6BuVQ9qiaKdjBxZCNhu7SPgHrBehHWGEBYLt8+RXetjaXGkiAUZ8OC5UMBvN5TkaHJtArSDaiZM=; 7:BKRt4ozGOqcdsvHOIz4CQvq4EtNmR/SQR0lADG2M/+MQWf2zvMVJ6mu4KVsKAlXMuxKmiCiWb6wXWyDG485K1L0LC1h/VWrPj3evp6dzmCK0xYfXB+2yAF6Tx5H2hJhkqME27O0R6uj+r1FxecelyTay7lsMmJFwCnE4ajPpcFTiwQxGH7wNPXFyKb1OsFYWR+9z9g5ePNA/m2aURum0iN+WYB9wL5XUr4iwRNKu2v2OkH+l4btehBqXsyYQca8h SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:06.9475 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ece2cd2d-d3f7-4f59-342a-08d60c641f03 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142924_770584_29778000 X-CRM114-Status: UNSURE ( 8.01 ) X-CRM114-Notice: Please train this message. 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.5.84 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh wpa_supplicant configuration has country parameter that is supposed to be used in AP mode to indicate supporting 802.11h and 802.11d. Reflect this configuration to Mesh also since Mesh is required to support 802.11h and 802.11d to use DFS channels. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 7b014b7..fe60589 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -298,6 +298,15 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, bss->conf->start_disabled = 1; bss->conf->mesh = MESH_ENABLED; bss->conf->ap_max_inactivity = wpa_s->conf->mesh_max_inactivity; + + if (ieee80211_is_dfs(ssid->frequency, wpa_s->hw.modes, + wpa_s->hw.num_modes) && wpa_s->conf->country[0]) { + conf->ieee80211h = 1; + conf->ieee80211d = 1; + conf->country[0] = wpa_s->conf->country[0]; + conf->country[1] = wpa_s->conf->country[1]; + } + bss->iconf = conf; ifmsh->conf = conf; From patchwork Mon Aug 27 21:28:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962650 Return-Path: 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=) 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="WFZ5wI38"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="o9TU5mW0"; 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 41zlTD2DW4z9s47 for ; Tue, 28 Aug 2018 07:32:00 +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=p1mq9NJ54ihfkdyRJjMOgHRITuH7j6iA4YW4P/dtlrs=; b=WFZ5wI38zvu8WX ZBl2smkBppvN+chcZP2rHyYQWBAB7s5sQP3MuZWMe+gLwz2NONk/wlvPiHrRF/BR5NJuyy8woq3/B 8A8yJut7MWvZfiVU3Nkp3T35YnTyDG9BPy+IeO3KQs9I9thz62eHPYuDjkyLLjRBu/Opaq/Dt9GLC DiMkZPs0awc6aIdhTCAttmOk/uAANdr1ggNcmSnK2yCc9g/SZLsjlScssBHI3OQKe4Lra1l+p4qeo HcjXvhxShQinbYMtwa9clSe/EX8NrO46K6MKnq/sDu2LYdyl/aUjC//kgkSRzzs3U25+eWJObadNP ub4mQCCSXZ2vvHvsb4/Q==; 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 1fuP71-0000R3-5A; Mon, 27 Aug 2018 21:31:51 +0000 Received: from mail-db3eur04on0603.outbound.protection.outlook.com ([2a01:111:f400:fe0c::603] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4f-0006Qn-9M for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:26 +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=fsJZKXZHRxilWyXyeDueFy2qh6sBasCfY24vSgySwy4=; b=o9TU5mW0ItBL/SaaEjQrR7TIInN5FcU42DvTZ3SUQ/7/nNQOLcI9AcXgKZqX1wCdatza/aU0xGvFww1SZMQE78+5ua38SOddpqhZK+zFxgdTS+1udPmB1A32rGKW7adZ6YEhIPoVk6pl57O1aqs5/JduICvhVUCQ0OXX5C3drKM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:08 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 07/16] mesh: apply channel attributes before setup interface Date: Mon, 27 Aug 2018 14:28:40 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: afe65472-5be2-409f-fb92-08d60c641fae X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:A56dA+Qyuj5dNv9kAgr/AphZkDMLFqBkfw6x2GY4oU+LHD3/Y2Twd8IxW6aFgnqAUWoBsdDD6jaWgMephwi5/lMHLG7svrnIKBczXk61VU9hGFSiwBgCcDeJml6joYXWFy7DEwZ/PrHhY8iYWrITXpwx0K4Z4opAQ6Xkek8Dr7CarQzU/9O29HIvrVu4mimmU2mw3Lt7lgg2YSCiALEKmwkHtQJLGcSQm/rS7pdBxk1z37TApw/QGYoYxD41lb2H; 25:hywLWqMG5tjpnL6Ms2kqlFbgnhTLQs2sBsVec0MhPbcDB8Ho/4og+TAbgmA8ylqec+IMF1fD6HoLbkJgWx2Fn7Fdije5fNHj4y7ZMiI7OMkimKBPJytpEvmOiIeOaOC88P54LcStBZdpVZ0IDPoeW6qPhTpnc+2N/JzXBsHzmkXPeU4feOqW+D7U9hUKiqvdee5gsjAVecvxMnA6gx0v8k8FshPJ+NgrrSR1RMUyyZvAZwWydO2jV2HPtHsFI84J/YRMd51s41lE1le3WhY4naPRlzGlYm6SgUQAdoXQYmNcxOFrI4jB/Exf1n9I+X2DlFLZ5G/Mk/jhepOS9qWKQQ==; 31:D2lEGzJ0wcwggJ35vjM/hMbN8uu7WssjU7fl36RDdznQ1Ix60ePcLsuZz5LIfENhws6rEae8a1JPGCvGcHvEJMqN5PPRAywx8SuAbWm3EPdhvttoKS+OI4K0yXtAijVab9NmvE+nWYQRaAm25ePjFvUg7Wanme/bIVLpnkCZxwe7Os4RnkzW0+2Ny8X632W4Ks9QLKcY+xteGQrl49oPhhbiJf6XDNpT/NZUFu2ZXrs= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:oHjzRJD9NMChDt8m18Ci1zB/NrQLj4uMn/NjQAGCNWxOyAzcNdqRBf1GAjpPDbHV2LoJqTMXWmsM9Njjx5C0VNVRyj0iYSDH1Vh1ALj9XlpuJXgisOFNd9MlOnLpn3FRAOKxiPdK6U6+hxA0uhbgGQ+qQhmDRHIGTy8Uaq+cr0yWNaNy/MLQFDzEbwAtlgl/ygWh3H6bpxCKn9ql6xAYxDsSHe/DqZliKiR3qbzIdhwcuEnZeYO4l+nH5gvW+qpYlagUoAz7iT5CnXZkLFw7cUjBeNZug5ixbdM8x8rRLnVeyx7gIRbA6Ggs3eJi3GIFblEqDZvBpFsowIOp22o5FtYpdtHV0T/GgsUXpa27nvOCXvs+7rJZKZX1GMD6Dti1jznMDkzWvnoLFXEJ8PcGn3xagTI1MQV9SwHlKMwq2e/CuYzhIRoQ0BopRtZdV6sN1QXrMI3uv5Px0cMgio4MkzTLoWFh3/Lb2KGMW/3YPoxL5ZPIrGFRoqPvAEpLsAUN; 4:Xl37svknWDmEv2Efl6V+BQP8lbyuB7PvKwifM6mMoexDBJHNAZmWid6vjV9u8sfIg1f6JoabJ0RuxjXe+QPDcNCEZzs062LIWCHKfUkb3K9KeBeugS/X0tpnf0g8/ZWhdcofjnQE6m6aidne2Y0BuuJI7fUczMQrFfMFYzZhtRzC18hCRJFtxaNdaVkKYLZIiwbvt9HTWp2ZlixWH//6dPlw9jL2zOssalV1wo2DZq7vLPlwz8gznxIv1lfh1P2gTdrqiOaDi06kYjyTacNZ+g== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:/s7hI+Qst2BUzrkO88aKNL5iEdQl1Zd/K6AXTUvbn?= XtVWuoySjrsO0hmvpcBn2uMm26zCUXlYFsleDqj1d37EWlxQdVXBkBQpLeH170RMCi4govwl+Bzxnd1yWIMQfM7B9qKCQdbB90GWL2g/3Do7wDGi+RqxNEG6paeeOnaBXikoLxRSQQBwWnUVMIRCcWbzjA4L6wMumPs+KkW6WZM5talTV+7m4FKUFXQuu+PngAWGcC5TRHoeRLl9TbGmjcshh15ZOUneO4FpVBSc3xqsHW1Bn4vjB8G+N8+LeRY4hQ9elSFVB3QzAjj7Q5u/nCMsf/Dx3/7zarxYfMgz2kBI8c5uOlhYuW2Q3Bp8C7WQmIF4YUUOBCUlNj9kY6mi0xpOKTt4JYd/cR4OiTtMpT3xxLV1kwy5xCsTZlZzcs0h8hNhbnLk6DpHek7KuFwVxbCpOfzm9jhOnu/hkptNdH1jWQ3HG78hU31ixarp91GBaGil2cutkvCKIbksjgL8eBaQOgGESoLH2HLwPifYtbL8sFmRmuAWTykHH5BygQiA9YEW87GyhW6tDNHByoMJKOxQ213acm1WmuC63iPt5fH17J6B1ZwkQTfz19Ex/CiwgX/XKGa2Cr9xxhp4zaBYhZzAeP0skhGLiUBBX6wPokTUWs9ouR+oc32gR/stNjAfT/NuWbgb4rQz6ioKoFGi29Mc6QlD8E6/VZNNDP7v4f3VqlNZl2vdjtfUcqmRatkwr467FVv9u52O+h6lCsvGH3uejMGHFP1kJEtoS7+2PcWo53gToQ5MMKR/xrHGARpKyqFPa42xMwFZInKRSJpPFHiCUF9LKVC4kSeWXXh+107OerYPmWR3bnuTqmAP2+Ds4+gehLmYUf0MH4OB5bonKCK1P5WQu/5bPWndh+RnfNawnkbz0bH2whw0vJ51pF4cwr9l3dEVYyqt1MMNoBfTIIVqXbvlP/scxzM/aQnNI7UcgR/R1JuBE+Yudh8diKOKZGA1eG2XfompLiJwV2q7UkJOcWSSMOL0Y3R+3r6prm8mAxdWPsgKuL2tST48NYeRfwJwL1E1zb6JIOr2ruZgEXQwrEXZBQKEN3KU48prw8CBa6C7WCjoVYwG9KAGPBLWPkoy4eecyCiDUYhKCkrpTvILiTmx7rtN5KSuDF2zkykK++K0zieixAvd/2WWHjB4BR4r71SZE0UjQK21Ruyt8RqOJdUm+RiuOHoj1QpyNoJl3sORWkvEi8PheCMZoF+hhWglIIuQS27qdK8vJiE4jUpZjE6XpUSv7jmzZVvjJyrfwIbwWm3RenJgs1QHBh4drvD0/teyYvm45Qxost5rFHpLlQXD7dvU/rMNVHqxbOmGA== X-Microsoft-Antispam-Message-Info: MKzY2wcOF5foyZSZo4L37mwe/MMMhbQXfz2hABaVDIiMngQDxcadg75yd34D+9U6PLmfwskr/Kb6C+6blYutXXZwwyMiG71xL32VdcITZkMwtDW1Jt7vVLwNSD3WWv4pv9TR3hhDLSIq24N++WsnKXLwJmTY7N7qAN0RDD55rcuzWsr8rAAoVT7bj8B3vGc1+yze6V5c5bGkTsyE7RSIJ0Qjurk7pYAMbGdxLEcxu9Oa28xCRckq26jRv9spix8oMGKUsdDlXTlgfX14Bb9GZZ44rzZgSUEZc2A8Up0uGSQjEA+0D0JuAlelZmmSKOFsxpxkKJG6pnbYiy8Yy62eHobPlywcTQEiDfJC+o+Rp6s= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:A5+0tT1cguMtpn1etHZOMlArcFYxy3XCFaOBlmhCFzJ1dsp43WgKVM3k+bctPpeu0pXtKxRbE7vHItDaUFfOQykwM25A4oRpA4wVN2xcQny3NrXeyO92ia8nQsk9hnGl9X2BysAwKSM3r6dCl0saDTEWE7/oMklult3bjHhdIdAQTwC+ibkEkDY/Bg/aXXoo4jWYoDS8oZIQ+UeFrhtngeW0nIDMiZHFZjOBddqMix/RNqlOpwe2vrePlsGmKA9BmgrOD6SK64/cj6WVKghD0dHDGpvTB5rLdBypi+TCkHaq/1Ze3VHOht955/Rk/uzh8AU1QQdEv8XAjGdouoOIpYYcs5aygdhHwAqzWKjHYQ36WmPbu0YEoZCq/vgF/Q3GIQkc5wujmHDKY0cdWMmBVZ8f3Y15aCOMgolV36/BPuJi1+tEx731XqTvfYJ5rXD27J1nH1FMEPx9//x00HL2dw==; 5:Q8miCWYMcTYytR2PjZUbK/1/ndyIsZA/otbDgBH7bH+Pg5iU/TBbxN8D0zRFFOtQn1X5UvY44ftBRIg+rVNJdloPUM7K1B4Uc0WEg9NwbL+PtK/0Jv3ZBWlmGQRMb6XmhzDIgkO8bt8WGRE7orOFJarL024sBGU+wZALjC4cWOM=; 7:+f4gbGAfR3PLFHLYIM47UN4AUTp+yRQHZ1ryqropP1ZwwWrW5oqLjIswIDd8Jds6ceCUzaOPAEA79U9qeW70va75Ibfyiadr/fUMEB0ucC0PcnpoauLZ7KrJH8rI0HLCOMlnhnE25ufk38p4PJo6zOyLqqkTixX4XZE7g0e3ZX7U0nN3BJ0ENmj7wAjdoCmPS4+pGkJekBwpOa5pLIXZajyol5pAtFqy0Bg2zyBAwgqScrH7e36WQZEhdz3Yidid SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:08.0693 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: afe65472-5be2-409f-fb92-08d60c641fae X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142925_400879_43970971 X-CRM114-Status: UNSURE ( 8.85 ) X-CRM114-Notice: Please train this message. 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 [2a01:111:f400:fe0c:0:0:0:603 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh This helps mesh interface initializes with correct channel parameters. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index fe60589..ab748b6 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -380,6 +380,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, conf->basic_rates[rate_len] = -1; } + wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); + if (hostapd_setup_interface(ifmsh)) { wpa_printf(MSG_ERROR, "Failed to initialize hostapd interface for mesh"); @@ -391,8 +393,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); - return 0; out_free: wpa_supplicant_mesh_deinit(wpa_s); From patchwork Mon Aug 27 21:28:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962651 Return-Path: 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=) 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="pUkf+ptI"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="geTjMeaA"; 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 41zlTp2ZsZz9s1c for ; Tue, 28 Aug 2018 07:32:30 +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=LxEPULmqiGRgPw9jCDjkEAa46LmPZCEw/KeCE/jyBfg=; b=pUkf+ptIdP4KTo ou6ngW6EqZhoYbx9NazxuxW+OT1xrR148P7BOUm9PW54PMdnVLMLoakCIpnouaRNP/pwXCoZvmxwC 0TkpSTQtH9YRjN1ahyjvxwL01Hm4Ji4EEsnigi1g5rbHPmweR6YKGYg62GlrdrWfUHX5wx9Zvhmlr d3tsLr7VxrKR5pDrDqnI2K4xSx3k4iLilweiGpCg7I6Hkzwr8wfDbx152L+9Wm2T4Cl5YxJZ5WP7V PC+0/j1m7FUgqI0WcovpuJXANAcyo5ETrW4/t1J59jUK+nUH7RKCRfWdmP+WkmWQbpzPlqUzzOgYL 4iDUbylauGfiX/tFklmg==; 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 1fuP7L-0000cd-07; Mon, 27 Aug 2018 21:32:11 +0000 Received: from mail-eopbgr50084.outbound.protection.outlook.com ([40.107.5.84] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4g-0006Rg-QM for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:28 +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=Fo/S1+m0QTFw/J9gAXcofhm2405glbABhQ1avwbzMYM=; b=geTjMeaAdvInhySQ0Z/xdTtZBchIbwrGOpdRtFONCadEUYIkYoOwilrtdOjf5RDx6HxPl5xPEZx83GTHEQGJJFj28YFPp6O4VbaTgZmYC/roeMzOGHytaZiYLGfGqzyhjS0foQ7OOHzdgPSOx2/jh6mFgfH1hxGHxSanERbLP+Y= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:09 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 08/16] mesh: update ssid->frequency as pri/sec channel switch Date: Mon, 27 Aug 2018 14:28:41 -0700 Message-Id: <5a46b40b844a421c2249dff1aa6936f1646a6a72.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3c5fa43a-8150-4ec3-6b93-08d60c642069 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:fTI5b1cBewO19Ddu5sqBBS3U9ZXGkb6QfBHO3u5+vjll7Hp1a6CoRm3030d9UZtrx0qMyEmzM+vl3v3YDwIOGmi5hjchwGp0Zk9lfR6TkXgyVhYYqsRtgJBohK+48ypLtm04TwL3dRPytgC+BwKNnp2Ey2D8H+a/M0RNpgAOC2eECP5cjv3pY9EuPd/8EyVamzd9jrhgsjM6WBba6HHwJwYRdr85xqyxCGTjWSKTsN0et7cEgN49crHd0RiTgaJS; 25:XpO6tbQgfM8YelcJZkOiNL7lYSbzbK6vEXWKyS35NzaFrx6gunpCcnl5S6eexi5L9CkpaMLp6gOcUlL/7d19cIAo5lvqMaRK0oZFoJPzsE71yzCL/40KX+GtKyxOmCUKurPRVAGYd1JcImepV1P7h1FatcUXAUQHD7aeSdOzK8AnbK+TQlLcP3qfJvtJnWdGbnrvm66c+VCts31OlOnAVSU0px9L5J4HSkNvRTGI78pQkkEOdlc5lipUqqUAmiU43E144XgOkW4aUOgkVQuDoC7hBRyocuaSE0puG8Ko3S/S3GyESfhckch3ohL/aJwu86ocDN3T/XJgJKEaTgFirQ==; 31:FVzaXRUWBOkxf+lUEpYBhRrjkaIBYzofj7nwc2bV+l0PAKiKjEIBaOx14AMCvmdwN1x1sikSHF7w91+22l3juNXUQghsw2iBLKp3WDsrnzTv+o93Pd32gn00wItY8dyqREP1fmeK5VhEZK1cVWJ+UbY/YA3UFD0w7Tykh8MTaBJtySX+yWkcSyWd8kUa3p9aJxDe8bEh60dD7wSVp+4gU/quyK0lhtdx7XrACv1mEIA= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:4O+j5dwygGGvJuNYdxqIhPZntavmokZIVlHefz8B+VOT5xR6bSbOj6LtIsNpa37/S0vuDU1bXNhTjvhWAQ/cK5YUw0NJzZL7qg+g37jpykKpBqZN8InhaKfAFVDrxU1hgiQECmPXYNey//at3Xy0K4HTj2d9vT/n9QluAi6QLr1+zd4JBXSXTHAOf+Q1gEnZ6t960TZc/JxU9kBCMImagvZzMJm1qKiDVPEMua7Q9sSylopGguYc78ACzk5hZy1UftsNi4rwzQ16ohL0dlzk6Ca168gOS7P2Zt2aloPES4Bo3KCVm+SV3+9m7Asl4h/RB3WV2t/SBc77IlFZICK33JjJXMwpSvxi0MS+X4gGusBcgDKRTxx2L7PbvX20oePJwb1BwD6yjva/1/YfgrAb6J1tUNwbixozYd0pAaDWEPbp4k2YOUlLCY2Vv70+DwLlvCbQ1CP3iIWVH725GHMS9jvJN/WmzifETT/pOxAEvNrJU6zl5vw27UIAX56fc/0j; 4:hc+Hlvb93sL9opkH6FzLPajyS3sGJG3YFkm84Po93vZeRZUJYSdw2MAxWYPtvh9BzIHKlH07O7n8K1Hme3N1p8+OqhWbO9iyBZpOIA9Ow15z0pDy6iRp6MKXlHRIOVG+lUvY4Ux7f5LcAGfCf77cDRT2CBL2MK70E0z/pNdDmW5eD+1Cb7/VfNXmFHVwR8aFQphoYXQCT2HR4cbTjla89geHFcC8Jf4DiSzDZ7uPTIY99X3/YQzTWT9RcZPiRt5A3c1o6P26x8GY53XfA9n67w== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:eEh7z1VULbn/9eNVpPiTzalQFoskWih9/FFGCnhJR?= KwDB41Mq4kGFmbCLHOv5ZI4lTaBkbME72bfIh9prLERy01WAiMyQJjzKhxn6zK+LPiB5UfGXU5z1oDpPAvOxuE0m1AqOZ34mxFERbSein2uL+OO0nvIZyUPaCJjA14AWZxk3SnzejIYbi2TPaeWqfEwl+/PkoRwdcg7WyCdOxBATBYvgbCYeVLv3/gtwyuOOY4e1NwcK0jdwcjzoquC+zg3Tvzib1hCdV2Tzxpg29f4ECsf7IQ6rT3shKvHYKhYcGEX4m/05o9Vgpx3H6kqz7AvoUU1The+VLGlH7SzzcXqMg05KuKfBs6W7qkoWw0sbq7uf4kcbEmXeh/ASfYE4AeHFLvAhRxm3SxE1l01E7sZlleRdMMUxeytQJNNJ+mkjh0APDT59Z8UkwpcWuUsakb543BdaZgiYRS/lYfPvmQ4HTDpiz2QJrhHpCGCWD8jFZI4ahAwjz40Vc46Emgz9MxB1nQVJnGQF0OosgfFH30DfZnId1NiIkSsXm0k46cvLPfAgLk/JovuhPfMypHQy8X7F4ZjJQxZrfbix3YlnvSqY2uAY9GYxroWAtfUShUgVWd+0W6ojRv2cphATH2yJ7hlRdM/AHrI072JJhchMMItTLEoamJOGXxK94WzICSZTQScQJsBGBeJbhCFf86Zo4qMZQ5m9/Z+xJK1L8S8XY6v+meZvHLLVzAzVrdKR6bp/cfTNCNxiBLBPyyE1dN4WkhFYPYBaDzJJpL6lkDmaRX0ab12yd8vW0XwiqLtcfRbg7xowSiq9MDe0rvUwLO2nLEITwNM2Fm9wmLoMyua+MY+kRbxDkrvVT9Ld3AUSbNxoW7nxHcnRkgD7bq3sipaf+ITbJT7Pa6joOoPJKaYIy7z00bMeYb+BpmX98LZLEg634B96Ve6e2Djw09RkNyLHSSdTI8wPJwn+qKp4j2X7GanniqkEvhh7dXQ5jxYY3aZeOYcL7gPaJS+ABv+Joo8CTs5y/pLVHryF53h5BqPGg2q+htunDbFiWbIZ99Bfm48Hj5C/YmYnmuVBPrm9VEMfKSIC3aJMdNacSw0N9GmHpbts/Z3FfBadA6fwHcYXOGREVd3ks9XLKr89lgBfU4w/0R0Y02DwgvFuQfQeCnm7CWw9WLMMyj2J85AwAbFzBKJdUq/FOJXuIDdfh84p2eVJgCFNO403qqhHhUAT1YuYpg5JnFH+YfUeO8ONaoE3TpZbhFr1fw/KlfdcaxBI0u4k5jiU8EjpylPkCqy/3t67oiyTM1tO6h4sJXNAdUySTT8hcN38FZAxqzDNsALFEeWnHWTvUoXEVir8Os9s1NNY5cG6g== X-Microsoft-Antispam-Message-Info: QItI7y5kG8Ce5TXwrSviGJGx6ALm55e3nk3pILIIgcXe4EeebfVUTiddzw/GId8hyZK4E2HhQKUlwTj5IvA2MRvWXR4ibC4J94RM35B5UzLuOhiQOCKlGlvkKo1DunDCLIhPBIMJstarJ666dXrrbiAmmMq4Z8R4ga5vpMLp5r9s/Va8vGyZizQI+SUDs6xQTvCTEhW4TkVCFwrsY7ABT8DMlTsnIOL9JFG9VbpMj3pZN5nv2UJM3TeGZ+kl3VFpfNYJrKZfl19hmZnxzCty/tyGOS0FbI5gBzUljl5FSdJgcRJwx1Ddklpn0zAYqAunQitBFOLQgbwPg2uYfqfFRmW1gRYSt0JsJTliem/qjOU= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:Y2nhN5shGeHGBqBQf6v9HeB02hRTbka0urKawEesSnz+k8g/5bUVBxRNXWwnps7GHkJsumf7OPseVLZFkFtTV9G0Xqwdggv+Qr6EnBPFpu9Bb1L22ziP3mUksSzt/i55OXjA2wOENDyTeWVUxEjeKBSdDYdaHu641TVwfrTSMqk03iG5mAxn1B2r4nQbdlg/hxzk1t5zswx+VJt+7O2w2IeTHqXtXgZ3rWFiNr8nTjltECHZaBhlhSdvgxuNjOOyjQS58zqBSakVcWELdsgoqk8jTS+uZVQUNd/8+GM0fV32JN51FNrIdAmskuXEK7fgXrBrxuZ0EZCna1bZwBaHmF/PYKx79mgOayFad4D9Vig9NprSASenAwmbv+IThnRxOLghrVzA4Q/rjzKI1os2n5tLmA5Fzbki9JktaCkQkI4n5Hp4If+yrgQJXHAbZhweSFJDPCFJsdjLPvuRSIoA3w==; 5:5hgz+zOwk4NTQBHMP2km43s1uP+Amd9l5gB8ZIbMaCSPbPGVKJstv6fn3J59oA32u50tMoe5MGXR6y/Nzi2FLsqcdOiNPCKpge2DHL5rtjrEB9/LPOkWRXBpTY6GN9bJf0PwwJbsJSKIL1PBYnbt6eh52b33rTi6cu8x4p+CzBI=; 7:ptpqgGX4c2yl0KZCpLTEon4IoVVnNbjOvOInUjYwCSFAsiaRxfUiZrDOlSDNjkB9dynEwdGUUqrC/Z1y6sSBV21GX7lNzq0llcw4iKedxlPq+Aa6a0xWuq7gPBybCB7f9YOUuAIpqct2ltyng39KNrBnbNNl/FjfoiC9a/I2CLWvouWZSlc79BSRNsrucIWsBffUvnogY8rjd00VPsigP1kZiz7GzOJIxnTQuiEJT4wa426UKmicKZNE+DCnroyI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:09.2871 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c5fa43a-8150-4ec3-6b93-08d60c642069 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142926_930579_98871008 X-CRM114-Status: UNSURE ( 7.79 ) X-CRM114-Notice: Please train this message. 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.5.84 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh ssid->frequency is one of variables used to gets channel number from given frequency. Leave it as unchanged when pri/sec channel switched will cause picking up wrong channel number after applying secondary channel offset for HT40 and leads failing interface bring-up. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 1 + 1 file changed, 1 insertion(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index ab748b6..06b82cd 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -285,6 +285,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, frequency == freq->freq + freq->sec_channel_offset * 20) { wpa_printf(MSG_DEBUG, "mesh: pri/sec channels switched"); frequency = freq->freq; + ssid->frequency = frequency; } wpa_s->assoc_freq = frequency; wpa_s->current_ssid = ssid; From patchwork Mon Aug 27 21:28:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962652 Return-Path: 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=) 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="JiL0Zq9R"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="XzHm9ZdI"; 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 41zlV55tWVz9s1c for ; Tue, 28 Aug 2018 07:32:45 +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=ef/3cw3BDryTnEr1cvfRWmcWvmC2FC0/LegveLu4B+g=; b=JiL0Zq9RE7h++n HmlCMx9jNmTXHqzQU8clkztuXbFAt9On0eyvqC8PHdn3oQIEE41M2BZ8NlDwJMLZNCnjS+VSAT2JU gaZgCpK2jUS1JLzbt5FFHvl8w5vXzJXVlQ8YVkkpixsY0sTtdYsYdplovbtZYJ4vD7LJwGZoOBMfN EN63bSagf9Pyhlpk+oE7mF4GN2viitKAqZacMPkZEMiLWzrscF0Fi3qDEGk2g4ur2dKHqSaw/Anvx dUCo4C08wBVkweIfJr83Hp9Hy0xvWQlWCA8hq1fDBPXKE85jtHVC69YwyoLZ5OCcYD+yMDIk/rJbS ZI5djSJ1OsaymxCuKayQ==; 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 1fuP7i-0000nP-P5; Mon, 27 Aug 2018 21:32:34 +0000 Received: from mail-db3eur04on0603.outbound.protection.outlook.com ([2a01:111:f400:fe0c::603] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4h-0006Qn-69 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:28 +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=2qD2fSUqtyBvVY/XXaJYa9EHWfbiWiSFu1lKYOruTjw=; b=XzHm9ZdIcH84onNYS7z94Ms35jlpsG/dWQ6T+3AWosDdDLFH1V3oZKAr1H3PZmDgRVGEQwoJ7m/qTJXPfVlmPx2KmZ9GbHpkcy4wm79eXsxqSOacHqEmKK6bDK2CJQJ3QFWZKgavivq63JLNwptftwR+mxA0BCBCUz6gSfLT6BI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:10 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 09/16] mesh: set interface type to mesh before setting interface Date: Mon, 27 Aug 2018 14:28:42 -0700 Message-Id: <15a44477c56b53efac0f1086662f57b7184a3197.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb3dbd2e-0ca6-415f-e6fc-08d60c64211d X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:6Vrc3AAPV3jnZiTVUbD9iJzkqAW+a+jYrFXxYtFFHGCoF1CLW1mrGsWwoJVeAisoQe9XKah6M9QPnFcEzL5UeTCXCeHlp3wKd4RR2BLxvgGu2YC0GA9L5br6YVM8QebZxZa0llDVEUnKISssGtRiuebVgj3Bkq84aZ3gUpmu/lsVqba11TzGV/CMtpGSGVetQh6VaaMAR0JXZ5tS2SLb9lEzoOhxxfefbLqigzONDiSNrAuMo4waefFvH1vsCxIW; 25:pOKdRK4Avrlnu8O0bNlAAEZc3AjvhjNp6+W+KnPWW6KGwxxwVgrQwp7/27gEs0UWL8D1qnN9TE7nAG0qkJX9Noamhsa6cRO5gi6wUUsEl+jyqC3dmVnxQ6P8uKFJtXKdJpadV5PDlpZWIm+ZZK/mKgfoLxJZQv7FsY5Q7KNxKmwEeie8U0t+NJbLROHwqrreZcE6fWGoTilDNwVDXOCNmCy66UTzxgotSHYx3H3tzii88wgPFJlhg77E2iAPVjvtyW56SqxpmoK+eYtTrlo9bMEuSskm5U/G8xYLE/TsnnRhJBARdtREPLzz7OgoI+/gl4Vt6YQaFpHIydXXibrvnA==; 31:Y1zRvBLy4uYj9TfXBBoliJC131CBL7UUnDbLRZ2TUP1e5WfwqjEo9qCd1nG6fcZAEzKy56bmEQ89PjwI378LzaJkuNGIrUlWX8ngYiIfXOen+xTTR9j9kbWZjYA9C2QoEHlkxc8zubdWuyQusAHe5vcGuW4/Kh0mCHm4KgYrjbVLhQbQ1AIKy5tgQCcnqEgGha0ZYC4wuDNb4mHXiLRq9Eb9YhmSJiOR7yVQNBXB2qg= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:r7EhfszrNQpJurlX839dYhlNzCzliyZO3dLPU2DJqvk+zZ57tiXEuKgZ03c2Y+0u9Cbc0KEcqMHYcKObqhIuv1nUTlIaZRmEcf4xsSuHBc78+9LQUEKh1LXLbZJ6y2FOeZDOlECS3Yf2z7Hh9sCuVVQ4yHRyJW+YZ6/oXAdkyRcZWjASkE6rq8w+aCxwjpVlhHRl/FYbg5Rsc5zWl4iTd/VwlmwPxwGW/XwFgPSrwSRgxiIKp6huYCsz9J0/U09oqDbKAZm1OCRAIK3016c4rlv89pkBX/IQHxrkffcXocFlHldEqJ4RX8O/vIy9ljQ1bJT0OzUGBtkPrR54S1YjXCVpbL+bKoUGVfW2ksw4hy36QKtNgrfZiBuoVACDyHy3jR1mMLc4QQeo9+JCUCqBvPGMmzqrVsvHTyvvRmhy98tijbGKcliWTcrjHZEXTNbKPoALRcSvIbgQhpZJXyBWEg60avss9MvAND2DFzC00+ITiaJP5+lOwAoZLwpw5zc3; 4:EP+t0OjGdpixmRQ2IbbmcfH7PjbIbJONUbyNkeLrmOiyYUDjjjEY66qW0QeYIxs6tO98ZqObPagu7mWqj5vGS6THXlrF/DSatXcA5nSt6sdg90YJWPiR39ZhWM401FBhUs2t2z2+4JpTYHhzvOlmx1yZc9X812Oz4+2RvrV2BRJ5XhwfvgRyGnaysQtVzxo5vIoSZYevLzXZyfV+xF2TRqqXACHJV/n8RBkkAj4IgIB7MMoM/NFOtd9I5CgBlGfuADRvLEpSvwAHFM067d49Dw== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:MG8LggNI6pzOYjRfE825sqemTIKkSJ02FDPxOy7xD?= Bmvotwa0P2NyeOmlHqLnvCdUPINu59BW2DFfhyCFep+oI1kZHQWusbZ4zdUYWzMrjwO7GK8B87lVhTBq3lb9yTB4nllb3dSqB9bcVadLhqWiGTUjkuysg89yCDaGCr57YcXxf+1D8E4PTZbjhGvKaZ+akoqY68M1sPq9Ycf8L/3an9Rc/mCUE4+g3aXDc8aaHtztd/CLonpGNkPLDYMI2CQBothULhN4L5C2JElef0BwdIjilLr8cAvFZSS6ATcdyFHnVCMeMsz1rZuM9/VLBBhsjBk61uV4p/xowVyTN/JI4Qj5JhRiJos7czf5DZBGc7nVT/uTFbGTtejABysvTQpAXG34S1PTGJeR0MSTV/zSHix/JtnYZNraBMqiOpFgOunqC1/lCTQNvFtBlsDqVwHzeCbuy7IjFONsnhaupfH1PxMBLI1gm5hm9tDH69HpQSDWafkUhOlocRkIL02ffVkILkkx9ycML4/uarbV8P2HNnys73/grl2ES/p+TTr+H5rAnMRC9ZkwnMhToXtrolU96ZQb+ly2hLivy1b/QMCpVKM9bEOXuebEK0kiRbEP/l1hkVmfg/vhlS45w1Oc/B0HXQAC2MGhoqBJipQqrC2q/yLxQ9ZBAwXu2hgpxr+wS7jh1pPQYz+DfBqfb8IPXBESQup+jBwRZ2oxi3Snt/xfqYimA3beaRIZFZpK1CVVx/zHdUPRoFSEUgmqVAFD4s9Fc1CV0pkIpXcVeF+2kVZamiJhU2JFPW4JD/c+wrDBvIZT9dGJa7ZT5aPHHvBEk3aCyF/VG4AS0Y5EFtjIcniLFQmEpsZ0eVlOwn5tY2ZxFQCWUAp6eLJB3lyiIcVhB28z+qZZFfGzJl8DdVNbSFMGJMSTrYZM3FlLSgSjbJgC04NB81tJZDm1NtUXNCGdNKTHeUEXKtxlC1soNPhlrf3qAfLupJodm/3LlIFtmdM05snzEPeBZjuO2Lk3iBLoUt2TMzoQjs5VczSL7Rwreg0dn4uhIwFDBDZy+dPPQMHyAGn3BAAKR4q4Sz/2LOLv8yHM8/9E4/+80Bi792szx43LQY+mJN1Jgwgmx2jA7JMKBgOues67lcldBSVdzZz9yDf/UgAy1oygJFYYoV5oLWxoRSwHNBYNM/GyHzgA4LQuFHslwOI6kTVvzWX1aSv+XVsNEVJindcEFfJngxEc7+OMzpn6RuRgowVgOcqBBhw7d7UkF8/INDaW/BvgsWH9EPuIbkn+kU7vWMgRPWHtVo6Eci+upVTP0DLd8odWl8OuO67kk+Ayzf32oR63Filr90FwKEURIL5vO8LSc4I8IjWDw== X-Microsoft-Antispam-Message-Info: FBmLdgb8qJtZBstAqJgO9JQnoQexmSIeoA5LpLm+YYyZEl2hM8O1Kd45WR49N7SZ4d856Bk+SC4UNk7G8uMHyf5q86RO/qad18xc4Uo/cz+mCGOHPSpdwO5dRogXvbkNDTnD6YnpKM8QxT97mBb+WK70EzvRHHknusD3tJ0Iz7Az8x2+GvUCulfZDpdJDlDJlf50UIlUMBf4DVIckQv11FhoAyfCKC1h/iqjmb5gglSOAR4jaE+66nJLcUCxsLfnnlAQcabLIizCuzjnU/ahPhynkOoG5vs6HqZgMNynuv1cAvZuTxqt0DBqikYueFJgktXo24SU62uXcinMbqO38ly82lhfdQrPAxMK8xRGGwU= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:mtCX/8Fa3tCq3erhe22mCAmTI7rCPEeUaNmCePi/D185rMYja8M01fhp64DlzaWt7NNuSPzcrWV+1VIFMl7QCydTZheZI2iGcBYZbehkWTTdPqE5Z4C05CoYO2EJkHfiL7vFJ9wlkBB7LapGN6M78ENeZuObuhYaifeTvhsPgErVlutT6+Uc4NAHU5aVf+75iTNAyofaSmyvMPpCoxKeeVgKeH6gKlCDEZCRR0w4/J9rFdo80VrMsuL1wH96P5qPGbkyG+NOwJfvJNbSz890OG7vI6GIzl7RYWEDZwWVPD4HQC8rqO4uPlDr18wSPg5TezJaemk1mvZkLFGjHMAJZW716nzBkf6po5t4S5+12aI09kHsb7B2PL3MKyMguNVdqquZJDiv97rGKpFQwSA2DqK86TRNFB6kBiJPn4Ah4WrY1/9TLY9JdfI1KTtq7Qq2JbimRFi2IYRFiqhxrKDDOg==; 5:c0Z7iGKybjfmihkcS/hzyL//wfe+gb4xNVa/43xMps9II73HKfS5wsVU7Ce2gSRivxQWCQOt8HJ8piE0xolUoHVQnOdZUPhcqMjpfEx5/UDFWup/9n58i/V3hEYCf/V20fhcy79j/+170Z+0e29HrS6VkcYRcS+ViuJMDGLIG/s=; 7:VH96wL/GmZ5+TuvJrU8rYockya8vjrbjT+hxUAkqDwhOfQO9UVB8S5jHouJDtkUvkD4SLcj7hjHZc3BsxSRj3iI+CRn+DwqAdAKNiwSTmMDcT9fsBQAV7/+TfINh3ZCSbJnju6SMeszRhpr5qgtLjLHSWXKN3cS/0vn6cdIf9+7FF+pTUMqxGlCGnctTeXfZWUryJrUBdSt3Yot4hf0A8xytVXmLUzxLAvI2a0gSiIzcSsyjtXsOs1VF3SLjAMUr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:10.4790 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb3dbd2e-0ca6-415f-e6fc-08d60c64211d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142927_335657_F81CC8CA X-CRM114-Status: UNSURE ( 8.72 ) X-CRM114-Notice: Please train this message. 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 [2a01:111:f400:fe0c:0:0:0:603 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh Correct interface type is required to start DFS CAC that can be triggered during interface setup. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 06b82cd..a039b5f 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -383,17 +383,17 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); - if (hostapd_setup_interface(ifmsh)) { - wpa_printf(MSG_ERROR, - "Failed to initialize hostapd interface for mesh"); - return -1; - } - if (wpa_drv_init_mesh(wpa_s)) { wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver"); return -1; } + if (hostapd_setup_interface(ifmsh)) { + wpa_printf(MSG_ERROR, + "Failed to initialize hostapd interface for mesh"); + return -1; + } + return 0; out_free: wpa_supplicant_mesh_deinit(wpa_s); From patchwork Mon Aug 27 21:28:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962656 Return-Path: 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=) 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="S5fo+efZ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="qkxh2YHm"; 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 41zlWl28tKz9s47 for ; Tue, 28 Aug 2018 07:34:11 +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=XQxNaXwh0gQeH9BLCt7CQ3lYyG6a458lfmDW9VMVIEo=; b=S5fo+efZSqsuZX FdRI1IVDZdQqvkRY6RD7rg705yobf39k8hFIo3PZTwh7DYJSxIKzn0wctwgLzrmZieP+DRsT+TOz2 VQDb04/JJY1wcf89Zq84rjLEs3ertIvaW1pStoHdzeod09PCI1oXGN0YKGkKg7MlsPpxgANc5aoUB AmZN5dCkY8dYNpJqN5H3FAW4aLdJ62H4UQEfqIuHzbEG5OFqY8DxIBjDtezxr4Fss0D+zPxDDzCLx hmC40Jq/UNnBTs+/s9yd6+6mXLwC0/EHDV7mmqcbOqQBPi2RCDlJbH4Z+HaJ6GvfCgOuJEBYgbBwS DnDX4fdg3sO2VXjINH3A==; 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 1fuP96-0001R4-VL; Mon, 27 Aug 2018 21:34:01 +0000 Received: from mail-eopbgr50084.outbound.protection.outlook.com ([40.107.5.84] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4i-0006Rg-Nm for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:30 +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=embgrU1SfE0msTVstXWerwsaR94diCGdXfGytCdC6hA=; b=qkxh2YHmQFE7QI70hzDTRf6PFwedsyN5WMo5Qx4VSHCoCR3q3LADCAzh0PjM/9OIjBgBwaEzywmel38LGZk9+V4JMKJKRx6HEh4u00Oqm6dM0iKLtw72dLCmoY3RJ95a1cVeJ4oyUAeCoo6iseJAJiIae2tyoXCkBD7TMSzzoLY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:11 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 10/16] mesh: set mesh center frequency Date: Mon, 27 Aug 2018 14:28:43 -0700 Message-Id: <63cee77e98fd3ea09143bc32a8535525b897eb48.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe4d302f-20ed-49b4-5883-08d60c6421cd X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:bwRXwIvbC5hD5d/QQ+xSxu3EkpO44M26enEUEdjBNdtVRWE0J+fU+6x4pSv+cEpb4DeD8TnD1yo7KTs6hC3XaLPqu8FihudEdjIbhFLLfijPemakLW0zo4++IRLYy+wp61LAt+IdQKZvZlRxrs/4QEV3QgxTi8enrWN1qp19F1WLUWUCGBi3k9blhNNEDxux8ZuxR8YAT6enZjoVPT54u/+0SVGt0JieaZbJqThWvM6j+NWalNZDrcMIt73v+sxs; 25:Ge2COIBcDyElYRRa1JCC0cxp2yTXRmgh5ZTx45XneQsuiAjWoW5VDxpKho5qB9mLtYMLuD6Ex1s25RkgY+kNdupabasdcOYYWrQ3BF9DXuQPSGQ3FNGDP/Hs2YWzGlmfoEmRndqFwtVXTGCKHgY0FE3bAwrqfuOfOcG2qjYzUDo2GhZlIYIfu9y/j8nDU4Y+9hCWV+e5RtYv39lOACSQOqqIEEGsTT5RvcEv3f3IJI+IQUpFCmjddAt0NdHmDfidOGSSoLuTAEM/tAJiCWP5CMbijBdR9QCs2K+z6dOWYbyh8S/O6IMgrGhfC/Z9kO/riGM5Qend4q1dBQW0ltdZ0Q==; 31:98wvxIDUPC+9GDUQYHYRFjWtJqdDgoI4OYerU7MUSl3WI+cfVDFahRSDvMjDdFbw9QMmx9+jNeXBJfoibsAg60AuEXg6ofmJu0yXsVvGkTf1u+vGVzeVfSz5c5I+1VyB/JhbuxuWLVis8PVjWBNkFznpxCATnpRkq0pi0rYDbfmfX80WLGEf576UNCktklRo1+iSn6wo0SjIpGjJv7mgm3iOI2ZFJHaoCQFTd73oONw= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:sS5RZWkaPr3bwEII0ekAyJOF8AUJHhJauaRkIWwLeuJCIt2c/IMEzFkBkLbStqVwY1pFIEOGG5pnSVrj3rxvKdYhSdyEKcJRwz8P52RBqiFh3Xcbvv84rl+C334NIH2cNBQ4R2dbOLGeIgX6cb/dkYrRw4zf1FEMuoiEARyGjssStrlU7LcGtfaKtQpw0BFa8sIZmRzZ/Iu2WF3J1HOT3n7Ua9njj1qDXXEpFIHnrrJE6M2Lv40EHU4xcXcsIWtrdgCe85O5wGLZUPqDKUvQ/pbp7Yb4M8bKaoN8oh06efEYjAjVYZUxtfk46BtElvGBtAud+bm84fGhhXj+eQ0tGDnpyUB0dAY5Gj3YtrRDWRFZxE1Rgzufo2uHjxBRu/zpL0mYJfvMokmedxBqcTWAwhY+n0PqdbL7N3nA1aXdxl14/qOYv1XOonqLP5Ls5AHPVneg68D/85GhHL3wzEzwGvzAACulzzkamJLedqLw943IhUjbHx4eEN+otEQz8CTu; 4:+dnCmuJjQQDp4tA3hEC9InHyIkhc2gPa2lzPBmlKdWIfnoTd81I3o3whKroyllv29BH1SlnNMKsisiVBrtAzYijPxzkwyCiiC+Idc6mTcO7Xq9yB6LVBX8E3/Twt8Z7ctQ8V6SZQbe6kv9j1wnEwteCzo5Q2ieJ87Z7gzQGsRzN6hCuZRi+8me2TOemszRerkEEdLqzebwgarvr8FhoBVtZKr1ARqLlcCfOTG8jg7RT8hLKWGiDKE5Rde7YwckyzvmakeiB9YWeS1Kg0kJzENQ== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:T1ceoNzCEZSP92QatTRi4z2s6kwAtAqJNs3ljhkhw?= 20yIbG0hmxo0ZgZvGO9RR3YnWvcJEHhCK7gFm02hb616sRRRyXBSDpHKmouR100Zb/B6ZO7cXmz8GPL/f9GIb4bZ6QtFEw2ry0300bLFrmZSTnSI0fp9QZuTNeri0Mx/zBb3gEJ68ZTPfvaGCDMrAdDewVnjFZRsP8pgx75U/xkI8k5+G+fFfrpvMUe8pjudJ1RV6jpo3x1nQ1gtt2AOCQCPRPtA/jYzWwGs5JdjInig91SoxNUcfeUHZ18FMmvDLiQ5fKQ/8Qri+PXzA82/y/jhhBc/NydQgE5rxpjQYkejhdsxKOUP1kmzJnm6uN8+2FIFjb78c4gGoeW14XkvvIQrL8vOd+/SPMJtTGHw2xbpvIXVL5xM5nkynesJxOj99h4VgzIfZYMQ+iPf9yI8t2AwoZdYgnSKRWTwbGxv6jMWH1SYJiGESdU9nZmzIRnla4VRinBudEGQyEcP1kCyZYbc9WPMTVPig4Z2Q72EjNTGJ5YwQW4/vaojE55E3EvRdJGMwKN8gVbWTBly+vle3hiIVCsjyvA3m9ED3V8SxTd2BeYHk07R6M0etl4jpiSPZy1nV7LPs/nRq/8Tow3ehqjuCWuqCsfwR/2amKHm3a92PKoow07VmcnpI+F8D+8PQKmCMpDeBtExoZQUpLuPgQ+z3QWz8qxyYWz3IKRhcrF8T23PxIeO++ANTmpKYIE8j3jQ+wTm2KICWFRLjhI1TZVO7q/VuR7C1MUBTIE+v+39tssHgc0zmfqtFzb87ov21UhC7jzcmtpzX189piHc7FxZDolbT8Nyal9e0CvN8arM7wq+AAJxUnFh7hURAmqOWps02+zznM7HW60llzw1i0Xhm4JKWyPgyg1pycRHb8vZpAE9vMron1BS7VVBaaGXO5+pMcM9WLx6PNqv1GMMJmVABqTWgA0mQbhAcdJmv8jdVC3arf9vl1vtJAiUQk9BwZQgtbK1OyTN8vWQnPNpSRmkEvxbWIKvX2sN51sk99rAvkPcQ0voMe7hr3o9eaki5Bqj/qHS7Qd0xNE3gNqvYlyACrvfiSn0Wk3hRf4GybOgqsnFKBoq6dVEmjIz7vZR+HgGBteYZR+dZh0VP63kIb/8fh2gZQvbQ/++K8TiwxRL6gkxzOElW+vE2VdUu+w7gHsBL5jkhHr813lOewCvCXi0/ZXJkKZ1KyYtQKIRn6W9r+4I3E9yD8vgqbrsIrVfxf2Cu8Pj5CHiX2wCmafm9m4UUcczuGMbqPn1S9j7+f1IdlhhSKLgAZa2z62oTH66dCy/urEW7uFQhlUKI3thl4bP5kHOJX8ftZkkgOlgL8Itg== X-Microsoft-Antispam-Message-Info: Bk1VY19ybKVIQ9ZVirjyFY8x71BNH8OsvshoU1n3LLjX+hiL9UP/ph5nh0aaWPkP9Lx1v7esPepDesI8g9hF49JmT/4B3MFS1D/ySlYOqtGLEe8dn0vpBpZIyqu2KrrV7YT5tUrjZBbstF9COreoN0qNg/CHhN8nq68bql8875xrxAzqvTjBVzpNJfMdMP/lZ8oGMsxa+wOOqQYiZ7LCgU/nenthUselF1lCti8tIHz6F4A5ZAYrMOotZKiT4EMvMLDKOqh+opqUZBej47HnHXcU3Ll9avleGqLUggWoTE9QE+UTeQXRZgp4qElVTv0GM/MRvGIORFJuG8/lqgrW3dXWagA/+INp3tLTuQzxoHY= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:JIh0e9nXGxyRYUTLcPuv5jc5sSJsGCf2lHA2eUdHbxmn+Ol89jK3Xn99lq1E1nrVZ3S/bbZNUVKtgZvxgIwTeZ7DeNQi6Xg9q99sEWzF27gVEl7UdvC96RRWuLYOEUEEj1hXcHn/bK3sCm+vGeJ8lDtc0sI849uMaB0PfwRxZ+BCim30tZSmF+PhoNKhyQBS9yaILvrZCIdyR7ZZd6nTK5ztBQAc+HbF2xx3T76FBk8xK0AM3o2jjZLRlEWMzkPUnTiGRa/9f8qo96XLvivojPHKZOhy+cpn68X0ScYKjwfqq3aFi+9qqhUj4E6RTV+EqekKFXUzjGDHOdHbGCCYOqN4KluF7a6LqkwHcakmtQPN7Sip2s1yxHAwCdfIAdH2eeD8K9s5PCU2GeIpGEx36LYlTGAIghJgzJlJ/uawR+NJvIPGHgTbi/hmidufvvs/aJDnGFaNQjfOb+Qw0tpIsg==; 5:+p2raK8X+UC89quucqRyH8Q4SD2XDwRhws+HqnaFoqjGrpHgzC1PRNCHYJK6Wl9dkuYZcMRJRNZzfPmcOKDSfKJF5U8ASNNgDw7xNv4J4d/0aXQwg6GWRCZqL7jLYnxeYvZAfYqzpA4HZqnxK3CNA+CowCxXlQEHjsu6/gEwDA8=; 7:1Bk+7e3sT1D2mrbxU3tHQJTsbxrFd17/g+aPYmAEj3sfE95+DgSVJkxCmsq+T2tbIdCK2X4E9nuO9FoIGy4gogdUHOWmVYN6QIihw3yhGqzzX7doeUyNikfmjsG/5kvtgv1QlIG5+aqt+eRdD1IrnChl5QbDHdz9U/pQ2ZYoimSHz3tcTMr0grrVPJ8S5hCsAshwciTgqkQksdLygFFpEkvta8PaiVo55SL27COfIbuSOxkcM9H5SZTTJYF/4LJo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:11.6247 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe4d302f-20ed-49b4-5883-08d60c6421cd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142928_816816_7CB25B9D X-CRM114-Status: UNSURE ( 7.60 ) X-CRM114-Notice: Please train this message. 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.5.84 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh vht center frequency value is required to compose the correct channel info. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 1 + 1 file changed, 1 insertion(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index a039b5f..cdaafd7 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -460,6 +460,7 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, if (wpa_s->mesh_vht_enabled) { ssid->vht = 1; + ssid->vht_center_freq1 = params->freq.center_freq1; switch (params->freq.bandwidth) { case 80: if (params->freq.center_freq2) { From patchwork Mon Aug 27 21:28:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962655 Return-Path: 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=) 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="CE6451WD"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="VD1ZZZOJ"; 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 41zlWN315Qz9s47 for ; Tue, 28 Aug 2018 07:33:52 +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=8ki5MnyeNBN/nt+MOLWHz+ceFDzgHngEGrhU/yzine4=; b=CE6451WD3Ksu6+ cfWQcI4X9wYLwQtyOOotyhAVHZR49Z9VfwgU/E2U2YDLgy8iEgfcxyGgJOR/jeSG3LHvpBfNFbiUX z5D0eI2c5WS//BDdvBNMvVDSvMwKTVOibPF6vAYEnhDe7cthB0eKLtOPRTJiTjBouqPakPofUTwDL oLOlqf3RJqT7LXT9G7EHluPR93Qx9GFPMbeYsSdq5DuTBOHkHFZ1xawXOKN/amOLq4IKGpFCBihFg gNuruJJsXtHX6MAiUCEQzyoRFyt2l7QT//csZXW5NFZbODgK05hAcz/CBBk06skTyUQnmxwUQ4IVY 5zySuL3UdgPr9jjfwiuA==; 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 1fuP8k-0001Gx-TL; Mon, 27 Aug 2018 21:33:39 +0000 Received: from mail-db3eur04on0603.outbound.protection.outlook.com ([2a01:111:f400:fe0c::603] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4j-0006Qn-3j for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:31 +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=qxsQMSxwDeNEur2iQe998wx+lkxUZHoBcju3rafsU4o=; b=VD1ZZZOJwSHCQftORN1kY90L8YASVVkcSGDe3QgMT57ghauqZoc5yui7tv0LrJd8H1ANjVDKI0TuvxHpoReo5n19yuBoOoFgyjvqOZxXtKf1KsJRdxvI0JpyYU+cJEvhJjbBeD4ZJwF0VxY9e4fDobYQa7mjsy38FR/LKFBOzOU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:12 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 11/16] mesh: consider mesh interface on dfs event handler Date: Mon, 27 Aug 2018 14:28:44 -0700 Message-Id: <2c1c1ca4e67dd3e8a6188c21235aba01bac701ac.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 242704ba-9d89-4a75-e895-08d60c64229f X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:XPkmyxBV1Ocao6CmnkIanQ/okFjLo/Vw1gwSnEuY1QBRJUlhfrPj57y5gniSkR1I+wx3dCBUwh/O4n/LZGbCA6oCDkRwg+bN36rIlCRKvrsOpWyZs9eak4kmDZrJ5oopVR+bCtNh45bmXUV6WziTvA6L6hKSRPHSCFyRgJl4a1B3lHNVphcJrZTL7KNOMZMoIFBh7aqlHkQFfYVKah85rJbyEu3JUvvTRCZH8TVadzaSqBmhBHg1BkDJFPUKaq1n; 25:grAcTotPNZRK+uHyPNAMlDI9kofML7cyjSqceXJYRGnIuBPDHFzGIhLVlGSfIZb0XN9IXspCMvuVSaODrA0H8Pi5D74LBGp1IoR+/7xQca6Umgf+FDGTvKXkne9aViAbfxYDLNykpqt/rsQqw8/ITt0+SN0RKtQJA+wfSvvmQsSFLSUfdp2tkq3L1K8iGzlm6NFgWh6eGE7nSx4h7eVpE1rDbXwhCIONrVAO/6PLs4HiQ0gepcl3EmJtlqCbY5WUTgT0S6k4dZw2tnYUW0rrcCnZ07nrE52lN9ZKmaNlhaiekay6+TR9BjfY+a1Vt0NkFzfF8ZwTGbYBY1OQan3YBQ==; 31:sq072mryGW28vJERPOw3q9Gidx75/+bXb0hrzQcEhIl950HLedyHkuCisLpPbbY9M9gyGFwmJaTIauvapV/jQd86iCNjUcAMmr7JblSqcooZA1in/fGSmspoyF+6n0TzYkSvATWPnvyLgdtodJyOuSW5PJn26uTWMSApwSqfdr/RtX0CbA9rUTnL0TLr0tGQUlo3+qC2ohyEvk6BQQY0+mFiImt+89aJkkSLA5QH7pE= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:MBMBPcn9UlrBHJzuQ0mohJjnhSOb2tGKmdx6yhDHHJQXUPHK/A4ZgoKXxvGqGIBF7rGVOJWKa9Ion7eVq9KlHufqDwpnIjhPocBYTQzpYzNIOyB/CR+OAauHRK3cye6nv0hN7bAP1KrxLsLJdANxlWv9xYl82pyVAENjUWDaJ7DkkRPxYPWGevS2yAQDezBP3BE9uQwB+BWevpjWUhLah/uH1O27FJ2JfEXOUHx+fF4z6KB3v8nmqzc1L3TOzGVWo6FM+6dDHyY6ruLDucTRLkavj+kUMqqGuSR2G5351MNWG68AbWlc7KwjM4C8xYUfvhsZgvSetmnoYTqrmBC+UNqe2HYJvKsZTc2x0Pgw1GMaE8Kz85SILxQRi4G4/WJDYcjJpml39dV0Mz1ak+8yl20ps7i+Bd3DgzEuFMNHypLwMxRqKy+3JEqyXk+NzSaJXNn1F9GpnO+Huxhrk3C86ucch5Rs7eVbOwWMVuOD/G/2JI9orNBPevsZQdfTa3Ts; 4:PF2ILO7xAnoIVzcoMKKriDs4rUBj2By5yJBTCKQzFR3rbH/7uHiowmPNvhhxbqRpESXLZKTH1Nsz2/SaLpnoVrMa1pWrNafR7OfAYZ/Kbcc0/zZ52h1P6j82T+ZJFRdG6741ThtHOkjX6QJ4dKrkau3fCx58ig5nMujJzvcxWRhk5WpGbqRdSbHocXXsli/K4UOd7GnKyEykp5ZBxigIAyUrFKb041z5AW5L8a9imi/pDIM/9GHo3gPNN5z3ZKX/glfSkhqZrz+rIUuTuRg9/KfrKitJMrM6FY6mHdvQZIm9p8SlWMzjchFyJFosCoEN X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(39060400002)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(54906003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(575784001)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:Egacqe4x1RHg3Z9QvVMjtCHYUxE4x0hPR2qcP7qqF?= Dqf39cJ53b3/NYxFLzlV37c9t9uGIRcQIBQMQY15+RlFAJu543Jg7BL0Io9gumYkKnGjYDWeb/5syTIk07GD7fje11MiOwx+9BZKkAGB1DxEoKmiq415JxjGBpyzTqnouB/AeNK966lbL//cV6OjLglzGLSZ6LU95cji1NDPCO0pkothkjMwQEWkcB4Khn8U8qokwl2JXZD1k+6w1Z3YTSJgGQf9cRSabtip1TYi2vX9AZPNGV/zUM9gzeEDhWWGROVRBFeOV5xh3Es8ghVEAl8EDjStMeQFj4tcnGHlOZfNgAfC8etW41yNUPORxFqOHoxcHxoYWQdRw3IuDM5PUEIJbg15CJWLV4E2KQgQvsHN4Qz4MdlXBCoaZdsf9oekR8Li+iIjdV3lxokkGoq9Rv9AnpO78m2GvB/D/qfcJn3n6WNqpVC/huk7lzoaxAohFN0uUWeRjXqprEAM/dNu8ivo3qpiCwEc7gzZvjWdzE6CTFLXn+Zo6H7WwM9Dx5QyhHlV/U+IkRoeGdkePcXaD6DK6Jm/gf75Oh/jPbQhlX/mq0lhb3v/tLhdErdZ7b0TApEdWj3etqB3XmYobVRbik27bPk3s+EtmR4y8Ej4Brt7lf2pVUbQkeRb/BNMpJ/fU9IEUXmaR68kvrF6kqzBp4/FgYFXmEQSE414uULyQn01lcAoUGXbJVg9HR//vp0+qt+YnZ4vBN2OdYqmR3nKJ7XYsasxzc/ur1LrUMZetCeoJ/Wzy26oJbIWbSR5DFNniWcyviSO8d1RvtWvLOPJHKswuXozimT02OWuLThDLpufU45TK8iS0HIohIiD9GAZxZwzrpTV53+015SDpLM58tc7pgu0O8cygNKnB4vfJh3X6IHFYHeAsuQzRALQsASCZoQ4rrcmA3a05F8J6TH4NV831y1fLX1He8C3ws29392KYfTQ/6Q3pZs9MeVfPw5oa0JYr7ra6Pq/IC6O0hxdBLDBFVM2U7D7WxuaWRv1roGQHc8ZtxEocQKvkpK6yndaS9zSpV2pOjM9YAGUOMD+pmcy5m8fjRn5fA5Px7vKYm6kH5H9JD0lHsZOz6zkm/EsN7114PnBj3BDLjxf/srtoaJY7rSSOLxZ04yMAzL9IH4OcJd6lzlSr9HlUzAhdW6Ueq+PF3dKePko72BrzIhXPuAAVr4tdDIybvrPiMIU2mDWahpfHCHOOgstnpNPc2dWw7fpdNqDKuWtnm6o0ZT6AyW9QdK//zj29eNgfHMddAhcH6t1EJb4GwHraqOia9GFPaoB5nh29ZXwDPOh8HXo9GBTL054QZ5ntZ5846oNTXCCW9TluoHUKqpJTcp1e1GXSGlnXgZtfE/r9aIOrClUsUCfO5Z1WfHqoN0VUqjZnnYAw== X-Microsoft-Antispam-Message-Info: sANsJHAg7p4qHYA+Nvqa8rSDAJliRH/K8wkN8yAXWX6xpabziDblAVSy+T7mmgcdeE+ApNnkg5Mhv+8VZ0FW+1dOfbdGiHLzadxfJqITWa4Yin70CZDfJZMzF5CUe3otFy5xXQxfFSS+DVsKQ3cO6YQs8LqWs3ucFBJiqUUAvTCkUt173St8UMGl8+ySCby1Cy5kNJzlvj4ZzQjvUwQAUN5oblIdyBw5E0uup3keb2Pc0fUOTBCplE8UJXXtzHstEYHGdOsWUSaoY5kjs9svrCS5YuKhEBu/gpwRBlhGtnfooUXoURHzKthE6sqvDfeQ7jJqq+B6QO8m7gmSbQkBOiTdsJi4YB3465jyJqEIqSM= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:Yxqk/lbZhT3QoOrLQ8LqXs5I4MxHduNk5iiNyDp+SG2yToZ8CiRgEglrdq/+izLvLnkPD2UIGjIkwDYg+ANKcjXYyvgO+G/tz4TNJlkVisxek3gpRq+o0dslFL+kgRNXpf5xmYE6y//nqLzHZwl/JUIniUt0YMcDu/6i2agcya+PQfH6XZqD8NehX4vbv3CJMqm+ggqKVUX0BDmZlir4fq46OZwKc+0fqoNFY+q+Zh9bQKrVYcLJXMNniJm05WaQZ7YV755gsY4MZqdfPXRbaLCRZlJ9QFKtKeSyaLhAARbbdj0JwVaTDKMq28QPMMOFF7DwX4Oo8pQ6boUQigYS/ozFpc6iCVvPHun/7yVwPC7KaAQeW9tdfWeZ1sQ3fg2DIZiqPApo1fjG8syqFPDwnqFq9LLJsA6Fd65aYgJurVZs3jLuTaNiBkNpS3wJ7MEdmBWy7jJ/dDcU7emhe29P0A==; 5:SQrYAQOwI7Te187mwD7mTy93SDI7Po62sSt9tRr6B6hUw1gDwmsT41r9tv6a9f8SlvS5SZWRVeFBA0OtO5jTE8qixhBqwtcfTumx/oj/mTpAjMPIHec/OWxDiAI/gG42bywk1K8MMEqF5dVvnm+Gm70+HPh3AuJIRwcK1ad7Sko=; 7:Xd8y8rgsmzrl3jN4XVC8eHWxUvEbR4Qrg7/oIRMBcyi6mOrs7Cnc4qTmmV04tnmWfQK/j/dQumsqh9ULj291T9YCmU+ID87h6VGH6B7HV3W6tHW8jbQ8Gbq8f9HJhrw+pv+6AnrO8Ym0+XI2a+SeySoyWyxzx7W19a0iBCy7QtakcYlCHAEpXErVjABFj9+ddYB30ua9IFJiuLd7xgKRKpsz73+s2ytPnOQ2SrXDV9EK+sb9bn40KKQt6j2oIESr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:12.8066 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 242704ba-9d89-4a75-e895-08d60c64229f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142929_247954_91960CD9 X-CRM114-Status: UNSURE ( 9.79 ) X-CRM114-Notice: Please train this message. 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 [2a01:111:f400:fe0c:0:0:0:603 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Masashi Honma , Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh Once mesh starts supporting DFS channels, it has to handle DFS related events from drivers, hence add mesh interface to the check list. Signed-off-by: Peter Oh Signed-off-by: Masashi Honma --- wpa_supplicant/ap.c | 71 ++++++++++++++++++++++++++++++++++++------------- wpa_supplicant/events.c | 7 ++--- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index ea846a0..eebbe0a 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -1379,13 +1379,18 @@ int ap_ctrl_iface_chanswitch(struct wpa_supplicant *wpa_s, const char *pos) void wpas_ap_ch_switch(struct wpa_supplicant *wpa_s, int freq, int ht, int offset, int width, int cf1, int cf2) { - if (!wpa_s->ap_iface) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + if (!wpa_s->ap_iface) { + if (!wpa_s->ifmsh) + return; + else + iface = wpa_s->ifmsh; + } wpa_s->assoc_freq = freq; if (wpa_s->current_ssid) wpa_s->current_ssid->frequency = freq; - hostapd_event_ch_switch(wpa_s->ap_iface->bss[0], freq, ht, + hostapd_event_ch_switch(iface->bss[0], freq, ht, offset, width, cf1, cf2); } @@ -1582,10 +1587,16 @@ int wpas_ap_pmksa_cache_add_external(struct wpa_supplicant *wpa_s, char *cmd) void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS radar detected on %d MHz", radar->freq); - hostapd_dfs_radar_detected(wpa_s->ap_iface, radar->freq, + hostapd_dfs_radar_detected(iface, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); @@ -1595,10 +1606,16 @@ void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS CAC started on %d MHz", radar->freq); - hostapd_dfs_start_cac(wpa_s->ap_iface, radar->freq, + hostapd_dfs_start_cac(iface, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } @@ -1607,10 +1624,16 @@ void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS CAC finished on %d MHz", radar->freq); - hostapd_dfs_complete_cac(wpa_s->ap_iface, 1, radar->freq, + hostapd_dfs_complete_cac(iface, 1, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } @@ -1619,10 +1642,16 @@ void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS CAC aborted on %d MHz", radar->freq); - hostapd_dfs_complete_cac(wpa_s->ap_iface, 0, radar->freq, + hostapd_dfs_complete_cac(iface, 0, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } @@ -1631,10 +1660,16 @@ void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) - return; + struct hostapd_iface *iface = wpa_s->ap_iface; + + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { + if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) + return; + else + iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS NOP finished on %d MHz", radar->freq); - hostapd_dfs_nop_finished(wpa_s->ap_iface, radar->freq, + hostapd_dfs_nop_finished(iface, radar->freq, radar->ht_enabled, radar->chan_offset, radar->chan_width, radar->cf1, radar->cf2); } diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 4cdca34..e43c1ac 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -3808,7 +3808,7 @@ static void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { #if defined(NEED_AP_MLME) && defined(CONFIG_AP) - if (wpa_s->ap_iface) { + if (wpa_s->ap_iface || wpa_s->ifmsh) { wpas_ap_event_dfs_cac_started(wpa_s, radar); } else #endif /* NEED_AP_MLME && CONFIG_AP */ @@ -3829,7 +3829,7 @@ static void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { #if defined(NEED_AP_MLME) && defined(CONFIG_AP) - if (wpa_s->ap_iface) { + if (wpa_s->ap_iface || wpa_s->ifmsh) { wpas_ap_event_dfs_cac_finished(wpa_s, radar); } else #endif /* NEED_AP_MLME && CONFIG_AP */ @@ -3845,7 +3845,7 @@ static void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, struct dfs_event *radar) { #if defined(NEED_AP_MLME) && defined(CONFIG_AP) - if (wpa_s->ap_iface) { + if (wpa_s->ap_iface || wpa_s->ifmsh) { wpas_ap_event_dfs_cac_aborted(wpa_s, radar); } else #endif /* NEED_AP_MLME && CONFIG_AP */ @@ -4286,6 +4286,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, #ifdef CONFIG_AP if (wpa_s->current_ssid->mode == WPAS_MODE_AP || wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO || + wpa_s->current_ssid->mode == WPAS_MODE_MESH || wpa_s->current_ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) { wpas_ap_ch_switch(wpa_s, data->ch_switch.freq, From patchwork Mon Aug 27 21:28:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962657 Return-Path: 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=) 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="fXZpnjR5"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="by8IwPoh"; 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 41zlXZ4gSRz9s47 for ; Tue, 28 Aug 2018 07:34:54 +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=2/tIgvUsjg4P1z/ctR+dns1dhB02hs45eGPW0LBhL48=; b=fXZpnjR5aOyf68 WkIVVdgyt/p908+jRaW37p3futf04MSF4dJEGqTkTj5mQpDumXG55+IqUdywcnTyANwEpi0mx1xIk 1/eD2zf3/ckfrgc+FUgQKqHKMprk7YwHNRQbVc9NidI/Nw871fJU5pAcfWy7YW+mm5QFouC8hCJCl wU0/QdaZqjM6tSgsdjXmx3W1yMW8nDDnqew8ycH8byUe+b3eS+3F5Exl/hZGROybENaMX1tCMvqB5 O/qb72Al2ewgt+WmfBfUhaFvbFECPi7saC3V2izqYPC4f4E9bl0RiaDGyoHzesCxyvUlq5Ms9JhFx +nw8Bd8y3+fmSD7HH2kg==; 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 1fuP9e-0001fY-RK; Mon, 27 Aug 2018 21:34:34 +0000 Received: from mail-eopbgr50059.outbound.protection.outlook.com ([40.107.5.59] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4k-0006Rn-Lb for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:32 +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=/XdHG4xxkraCt3scB8+cG3D8sSntPGv2NiavyXRwyhc=; b=by8IwPohgbcsZnRI/8wCZYDFXLXoD0Q88L+xM9scH9UlXCNAt5Vii6Q5Ws3znzAZMARS5jHwBtY2cu5n9W8iwsNbNGCJv3Ti7jyxo2hkKl2wR4P1Pi4k3QDSmR9rz8erkiThYwLgzncsjTBREXzhE80Ggp3UAta7P2mPW4Cnf38= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:14 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 12/16] mesh: Allow DFS channels to be selected if dfs is enabled Date: Mon, 27 Aug 2018 14:28:45 -0700 Message-Id: <4f889807b2b07973f5bec68ed73c0e3dd7061064.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c64f1dd6-8557-4cd8-e961-08d60c642360 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:UMjOw8Wff8KpYC70Tzzjtzxgvq+yPumnL2QVeuIcsMdQ2DI8RJz9UNfWIZ6rRm1rfeSh2O/lsdVRVT8i1vG4IQyTw5NeRcRA9/HjYdGOgTG+dkOlgozFvrLWfTwYwOY2hdy3Fgz7As/snUEecAWp2EBCxtgnlK8MsoRhkxA7MCUo1n+NLnfLKdzYeUURX8UMa5u9zA/kFJDJXPOLwT5aDAjQesGjciOjTQj+Qz4z1VxHWvHnNOTqIewG3a52+bu6; 25:/OMru4buaugD4BJcFuFvbZqEwFaZjGVj6Ub5+pQjDxfJhsGymVfXztQ3aisiCB1sz/mH2SdTvX8rj30BzZyht7f7jo/fXNZBBg/RJdrmmbxVlsUkMbHNoGDT7mi8MPIyOWa3at9dQT+y9xiF4uuZHmqizliEq/Kph6nZ7wJ3U7ywrJCsauWoyw/tvRdh68ls3LxXDo2VOeeTKB6mTOpvE876VVkNcbKqUgh3rLpmiH0fekEBma2FJ6DATA3g4lgtEV55HZbJTyXX5Uw/0OmAAZf++/H2u1VWV8fhmMYJ26WxI6+YIK3ihSN2MywcVSD/8qjVa+lXrYmlgp9jy+66HQ==; 31:zxrbzX9EIgAWFkIWZeSw44X2NPXO1IkbJQFCj46AZjgAQ8bvVqGY/ONfJnCpQDqBUL6p6RfHBF1CUp8BLhGxs8Kf6593RbG/jCmDpZszX895LRfLOxKUUbN1UmxG6SXaF1PkwJ2I3gjis6LjeIrcgVTpcYLHWERUaWgDrIGX/wsn5ZeoL20GAtC2gWA6Q5nGe7whHFaQY3QkT8En0dYvMXb0vlDtXznqskm08pgMX+o= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:5kDKnyjoLyObDoedRv6tvISKfjJoz3N5ue3+EZ33G4Pfxrl7HS4AfoOP37WF+UKnstcpMu/0rke5oxUdjMquZ2pmaDlu0okF3VPk+JIsa/vhkq26HsjAUlKFw9WwRXmWS1XbesqXYvnDOPBRP3THW34Y9zZ77Rfwa5M+nFcuO/YFhHCia5ABnrxJcp6L7lpmfT/wJr+DVRphuf8HJn5VGM1gEi2JnUIR3Q1vZJ9aSeP6884f5YFE5vRMxFGHncc+CfoLMQ5EgBqpC69D0bNm/T8Fm35oGBNh9j5dXv/eBNh+P3zmJUvy7aALtFgcvWVIvz8y6lDEdKp6ChtCjD/YOPxsSVh4ZyptU0EMTnI6KsFgYrQNwvpEmQjeWXYPNVHeVqMczMJmYMF1JnSn/HQ/cg4O52IATOvQkgQpqeui0VPhbYSfigny62a7OYP0Y+eiFmr+41/nU4O/MxlIukeozIiL8rog+IdwH2LMg5+ROHvU4PNaMnKmbDRrSTNNl8L4; 4:NJj4/AqtzXoNiVf1p7C9hWmpzSXpHh09LTKqCKnbK8U4hnCdIRVpvlZmhx3j0wfqyN/GaxN+Qt5WII3haVOF8RRxes7Weq6bpaObaxtqKtgW5UERlH/e/IJqxyURtCzRRF7gDIKkeK4gna7Qu9lx94bTN5lgLoOPyvTZ5llvkrxNDb4N9L+BEbgOGv5uu9uKadb9w7G+ls4ZsPZ66rZxA3hEwFZpKy+TTrGkVsj7EPZQ4/rh230KOUSyzyFmd2FDBGDNJSm44O90ijVtVYJ8kw== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(14444005)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(54906003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:VM2F+ZOCWFxEXxbvDpLnrytC6HgqJ64bGTeCi7iQ0?= D0omoJL8Ks58Sr2/QzY/21kpLE49ktUj3AE0RhkfJJqmIg0ljymSM841aAIaOwQsnbZvIM8wvkTyTLdn4M2WKQF/tFS/1JRLY8oK4thmPQmFW8WlyHZedugnaRrut2BaXVLF935Tcglp+w8f7HISZYCN85IqsvGJAwvl9rbBr0uraespteV4doBE/VxUl1FGKEom9H5w0vO/DikDJfcAaRff0cd7Th74PS6ZBeZiuyUTveYeq7EIkpRJWk8zxa1FPAjNQgusPoSai2IKip86DSUxo9epJSz10iabXffEgcySz4/yrwH922dw7riTl/pRPd3QsG57w9TiXzP4BLnmt3HVlnZPk/vane4jzOir40dcsJBv+e1AkL0iinIq1rsRrEXqSzwzW2qLGbrHMkqj+t7IhhheUFbGCs2lf5LdokaEvv2uYewCVXh9DNeKBZOBM5eYwMRhQcCQikZ5OzutySMrFe/vC4gI1OIDqgNZREgtuE0hGDwkEsCPV/zcnU9XORQA6gG5D7/2u8FJEfHhsBOzb3bJeCeY01ZMUoRv7ftp97OhuFNmk3l6isP3EQSXVKmRK0BD3UvU3N2HCZB788p/UjiMMQy8ZvRRyqm1stQMRfVQHTJhyFM8YvGmrI4zUqcNeWxdjkxJb5qUisGL1nWJmVS2XtOE3eX4r1ojXL7bIcjjk0s986Rbuv2hbZCyjmTTUervy2ABIYCc8PzMWFaIUIDhmHBBDHPxpIgy9pnLJmGYbvNTXHOMo+X/jraiGCJIe4SKHPptAbZOaXJhS4JMJfLV4A8CRTZjZ9WAZFmpMXcXwOm5PEyOn/bm25ayPIl21gU8M9vO4YwpZX0+5DPoMH5ZXM/K2y8+bQe5HHQOApP3QTH/MZY/0BgXAx1ut28rdwrF04h6AnmrBJHLdnk4WY9J1difeglCDkNvPDkc6VthCwUMsnUwe/+LStBLzi8SOpur2kdv1A+qzmTbCngkmQ6aA/4j3E//T0m+LEnZjHhQn97WcXCRCAjdsTKSFKt48rgmchm6LeVt7rFj79PnIVjCpzhUMJJq9yOzg23NoJbmOFiXcy9CQFRABP51mCGKItm8BoU0MQ4Z+nik+aMveC6mBS1Q5nqzQAx0HaJGpQpjOHLX+mMPfDwRn/wrjYQ8gmZvOcaQR/r0qVa09PdRJVsTg8kat2N9+eGX0rco+gJ5dAuzEDSABTUrY8ej/ktG/SE9JxvBFgyl47p/ldD2V16h3vBH+Rvlq+rHTe6Wstjl5uM4DkIzSiBOfY82QB9eoyRBLD4dB895kZO78PpIBEPph8t4EAaJWc21OLHUDCNl35ooYTDbjEywonFNyo= X-Microsoft-Antispam-Message-Info: 5BW7oVbwwR1CJTx93dkW9vOgojlbcgFdArMOG3mRk0l2kfaTGgK2OePHwTX5qMCPL9zyldo7ZSdf9+IxKm5mzW+Ff9KQ+qGuqWFi9OZsjwmd+GwWeVw/NP51RV+HGPLbzm6UxqbkNa27GcRUV67zVUSPHkCHOpq1a1132BI4L01uRGDfj1jCHoyZ+0h3338NPgbGjKWBV8Ba4peN3RkloyTuF7Rq9i/JGrFN9QKSXYhnsCl31v+4xuT7aoHt0e5tJumN9VyQRJ4TptLqc/zXiFZhDdl5Mn/bTKmc+5KjsCtW1/wGcaPs5sU+QSyyGeGfd5rgBStcnmb3RqHt1Vs/hW4QQMTog5BxEoLw+pfsNJ0= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:W1vpgVXJ42hA6uMymoQa5991Nk6ZaaLz1YQol5vPcOSY9skkCMWvszOMQRym/6rcUwNU/LAbbR/ycL2KCdfI5nEV+Y6HM/1EqRWg2RrLKx4qliVmeBEgN8fTR9dS5dkDAJiQ7WGM3vp//yOr4MNUvluboZdLwuxyuqbn+CgNy/ydLLqJ3R3ZkvJ3rg/Q0+YgShWYsWm9XwuczJUAY/QWR4XxQGRM6VG7Bo/gRs+cqGNTYk6ZyWrfBIe+i0H7C0WCXUO+hzs7BRULhQNb6uaoPsir/HGf34owU4VkE9XAuWzYgAQuZ6i/89a0xabqK8ydAbM61/F3DO05NW2BCC1LylsJZRTmTq11NA23oMkn1eiyAaYB0oCtJ5/eVLR7yLl5EyZrQywLHeMGOq85CvFcaQVH4TdfTlFhE9CzfpxzAGpUfI85S189Xz162YotPMi5XZWASqZj+CWZkwtn8rRC8Q==; 5:jAxm9lX1redf/tv8wGpdF774u4c1pfEi6i9kI9swjN98lAL5eA1Yd3gEbqtvwlw8j+B2DLHnm1iw4JoeiajVtnvLSqZmJ804AATi4Xj5GUPWEbQOGwa6TO2vt6zIKFZyR7wkcPv8YCSeX2HY7Y9hpTQ1+Lw8Y03taL+9nDbTVGQ=; 7:p4hG3SR9lduS7y3LAmkmv5sXrWG5ATcpoO+8frA6nR5FVniEHwHZ+ILw7uqz2sx/P6tA9RHUjFkX1oxkJa03O3585XVpy52RSqc4SVzEqwuzQ7ervoesdaWmzVi4uXlbQlTMrLFVnxTswNwUzFxYnkMw5M/GwIDQ3mqd8atuYfUDBBc5PNgjdQu/AEU24gYSTBkR24K72lleB693KHIIHTOUauTNCsIB5ct5Ku0eDMCVfHtz3uPHzEGiWAmyWvYh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:14.0794 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c64f1dd6-8557-4cd8-e961-08d60c642360 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142930_830118_4A06EBD2 X-CRM114-Status: UNSURE ( 9.16 ) X-CRM114-Notice: Please train this message. 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.5.59 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Benjamin Berg , Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh Note: DFS is assumed to be usable if a country code has been set Signed-off-by: Benjamin Berg Signed-off-by: Peter Oh --- wpa_supplicant/wpa_supplicant.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 8bd2727..fe4e48f 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2087,6 +2087,8 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, struct hostapd_freq_params vht_freq; int chwidth, seg0, seg1; u32 vht_caps = 0; + int dfs_enabled = wpa_s->conf->country[0] && + (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR); freq->freq = ssid->frequency; @@ -2163,8 +2165,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Check primary channel flags */ - if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (pri_chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; #ifdef CONFIG_HT_OVERRIDES if (ssid->disable_ht40) @@ -2190,8 +2195,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Check secondary channel flags */ - if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (sec_chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; freq->channel = pri_chan->chan; @@ -2281,8 +2289,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, return; /* Back to HT configuration if channel not usable */ - if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR)) + if (chan->flag & HOSTAPD_CHAN_DISABLED) return; + if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + return; } chwidth = VHT_CHANWIDTH_80MHZ; @@ -2302,10 +2313,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, if (!chan) continue; - if (chan->flag & (HOSTAPD_CHAN_DISABLED | - HOSTAPD_CHAN_NO_IR | - HOSTAPD_CHAN_RADAR)) + if (chan->flag & HOSTAPD_CHAN_DISABLED) continue; + if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR)) + if (!dfs_enabled) + continue; /* Found a suitable second segment for 80+80 */ chwidth = VHT_CHANWIDTH_80P80MHZ; From patchwork Mon Aug 27 21:28:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962654 Return-Path: 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=) 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="FmjnimXf"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="Huixpj7K"; 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 41zlVw6sLZz9s47 for ; Tue, 28 Aug 2018 07:33:28 +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=C7qKGRlYuh5gLvLnvtNZ25J23ZaYWBejv5ESpS4O4Zg=; b=FmjnimXfh50e+y bbRGtf6PiyEP5aHbBoojDdmgTatXT5Hm+11UciOG0NueTzjlDu2tf5Npy50irAxtrGThOxmopCtIb 0ngoDPBTRFPohErNVONHJC/0k89T8aKUjq5OO1wnHySNcFmX62AO7noS85bq0iCCxPHr5p1Zj4Uhp AuQo2uHTYGdiHGFP/ybePX6wHp94LOypk5WBepIxwZUbb6WTSgdgOvAT0OsFIOC+MEKpnhA7xNxHq AbQRnG1tF9tf3GHeVPHo9c8TtF7tDMxVovnPUyFMVXrn7NX9qGBmEWNzwEAOIJmcO5BdAk5uDFa1a 1Q1+Zm5dRVUzXseQVSSQ==; 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 1fuP8Q-00017C-4r; Mon, 27 Aug 2018 21:33:18 +0000 Received: from mail-eopbgr50084.outbound.protection.outlook.com ([40.107.5.84] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4l-0006Rg-82 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:32 +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=f67LyjxSl5hPj8DOhl4irzrYgal1EDR7urLg1IHW3jI=; b=Huixpj7KFzAf7JGRnyf6RvUvMPGeW4m/dV6POHUKwTt1wM7AVaJVxkeEXBv1ClaafeXaVOKePLVjHbsP3NUSVp57P6Bqfu8xJyIFi+qFNRf8ILYL+PqxJuJhek1xGBjxzd/oju2Vs6AmZZzvhgzCxtqfhM18S+2Wn/puJWJeMNA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:15 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 13/16] mesh: do not set offchanok on DFS channels in non-ETSI Date: Mon, 27 Aug 2018 14:28:46 -0700 Message-Id: <1c52bf51870d1c1ff78aa3aa9e7032087de0794d.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3fc6b3c7-5359-49f1-12d5-08d60c642417 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:FIPNs7XKZx4pKH3/pZ4tmFlkf9fUuFkvPs2lUIGP12Wr0fodemMez+PKj/0rQjhxgKSXqnMPjM5lADVdatPrH2zrvzjMS4yALzLNvGyKcvmLYEISPofPn/pD4q5EqxNdG3DUMHr3LShIX7gIKufGajzk7m9rTdrvwyBRtOuXd1vrhOHRq0ezA7YYavZIPWZleyxjpL5CQVa7vs0XbWVEjlFhVuVQce2JEVBojACkzdftMzZmGrG6QqTdcTuaenx9; 25:U3Hq5nLBlc/BAs0IC7uIm5pArlXElU1kISB73JsDldHT4VK1USB9MEQcca4IDPwjEeiGSnMTjti2PUU3BVyBcziRqtC0za6enxEF93i2LuXuCYXO/O3SveojEo+4Y1x+9ObPCauleZX5AbsDFEMydempQGQBpIqqMZw/fMPEWx4rs48Biz5novcnScVipEApqwgkDZUrZGqQB3LFpWxa+ploy6tGB7ab7jBTuXrrsIx9r1lohLxGLfBGOG0Uzy6BpA+i0HZjPoFIK++RtR/FP9pCkIRRvLZQejOWwTlLnwi1Ru5+23kdwqG90w6LBLilFLhP3/JrBqVVrptxnk/6WQ==; 31:gYaAaIztzhsEtS3l3IAaWTVsmuawMWHKWkanjc0BvzoTvAZPqH1hN2LiPkgBnPpKa574oOaU2uPdjVJDig5oqiaFU0TKK+d6EyJg/0eOW3pvq1zSo1QC7bsNK+43Z5f/k6OCYiTcZ/aizVJkCVOy9G0Ner2R+UkQ7C/TWRXYnxGjbuabujdWyaUdSwpezIVy4vFkCOiRVAetJxN4jTsL9C+nQRdlo0ODt0ziue5Ph4Q= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:bofYjw7rdN++VMED8WYYN5kZLVbJ144Ij1VritxEF/FKRwMHLOSnUHdZ56V68dgRIPXP5kfGFXR35oJ0kE4Xu+9cX472ROwkKqtZCcG6mm+/02mnE/T7oOS/rpHOzRqNxV2eP/ECffC2jRLnDaNSIC4l0xmeizh6TeF4gz6vVV93Cif+xjaNl6ab77EfrPvYqHXWWbsQMlzK0OxvL/7b1qT6HDpjhr6OkGbCkM4tdvA91oas/7lf/SfO3wZ3LKLO8re5nPKdG9d96jgf+5WHSFch+59oM1X8gIx3Mzk5ZRGOcz+1J7QRxxCdJBQTCNkv5NnQ5kG9I7HvxzVd6ae7ISDHUKhCLMdBaXd00sujRNG9rLPffX5TW6Ig/a4zkKtjIU4RGnsE5iftNBiu6fdqaxm9oSbpIHCAZlxa1QEagBNPP+56UQgLyoWs9Eu3iTDeVDyIJPGHguWOZFuO28ImeCgl6sIS/6NNt3e29SybFpUBcteg5FgVjypJx9UxSbfD; 4:OrlDcXHHZyeammufj+lZHB90kFzZ1M/h7gr6WLQCLMic7DBenU66lpczZruqg12qcgczM1DZpBqoUvHXwd1qTYfnVI1+r7yVGP8rYpNaaCu07THLf9dbW6jhid6wPUGNeHS7+bGUrZmb725sh92OnyCjv5mxM5aw3ZEoGlnxdlsZLYn0vc0leN8rirNJfgTzKYS5376DpnOgS+cb6bMq2Hg6bln2LWfB7cdM8iCCY22lxESCIwzjfyjfPtJzI1Y9IAXhQSuBykQ0m3RQHPr3uA== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(14444005)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:/T7yRezKm2/BfBsJqfNP1o0erlbTwfgZcQN3BYKiG?= mN2T4ib9/eXLhL+FAGuWNfBN9Q3VHk5wOIOdulo88qVNcbArCpcrKN/ygi+ZM1BLTmU60TZRReBzfebLJXi7I+f6BdTu2o5+f+ssbkpn87OyakdW9J+X4i0Yjps+SUYX7GU7sr1kk235EhnmcGUAHGAr399t9seKjFfHo8/xg+8kIVxo7g2REgDJBaLuMKDIDbMo9ISllqogA2uH/XMTtHA+bV4RpT1G/6iFTinqnoWNF0CDueu1HaYia3oqC91KgI73XpH6hyR8Epz+pwrG8Fx3Mlh2QDfgGOVbwXTvQMMfx/ImZxFSVU4rBgjcut4bOuDIeveAgIF47wDmSiVnajNKBbl3n6Z4lzF1R26MkjyUULGaEU2iiOl/HwdZWpqvmpbUgPkm8mfQXVRw6y+eBwesjHAL5yN+s9XAO+J7EyqzL3ZVO/xlvhCuTZViEhOI7KTQjmUMp6FBzP4fQXqm+941bIz0dSR/rmy3N4LZO+uvBzic6mM53xISBkXeztJTDx68Vdei++LmzlEgs4zHxhc0d6xIsvT8YQatRGY6aU3k+8E/uAx7xDypJSwscVvBEiHCtYfPGFSa89ReMqhsqtKmgqqrnMnJBL9idlAZFjGhjgbGrJj1d1v+N1NLtobiGriFyIGcovEDgloiOwS0Ktnynir4D7OfNlm2ZT+EGulwmtigkZwbjWjYnZpW29/x70SU+hWvEQ5prikmJV7JWLiOvJkQ6pfo52x/ZWdNtA6eAbV4VsYExSUlRjLoWNKpyykeVeHol+nn5VDAj/8a2fhSV40xng/CQyDrxXT+BnSXyl18SmrxoB/i7O0kxMuhvQFRAZJB7Un5AK6g6lRMaMxuEsHjrN+b7M0nDtKEjbI9Bs1XCAW9k0U2RTE+i8D1wsimtj6okagIcHH3apUt+InEOjvVqGid3gJaPL9llMP4kiJ3RP9gQFj7+qK7laTiNeNHqBl4BOUVaqaFBCmX4fV8PZhFer9NRt/hYiIFaMRdJN1aq17U53E6UCxFWY80ZqIsvvsMVepiCbP5DHZWoI47ZPghyZS3UBcZINZEW882nOjU8MOmfEnOTX3SqAAwUE9RkWWP0BmBrlo+dE256EysPfXguj6Dx6rYQSUw0w/IKkpf2KdA/NsJYgE7ASp2tg/Twq1zAVfX0eR5qMoj8XR69djT3VgeVQtCRPTMQH8Ks74qnh0UDSwGzYGpXTrrBWrTQxRJcu/o1lExtCKArc5VJ8YdzDQfF+6FIoINH+tPopep6xeZeNrhJrmbVjo0q/BcZM71LahK3is/QMl35QVn5+XDpglEE0UfsnNz8M+z+keiIiHlO94wgf35utDVYY= X-Microsoft-Antispam-Message-Info: +Y2S3xWd+DJCmDI+6MOXkY/QWgCXjI7Q2fo1fy+vmzMpOdazxOcZVE+5xJZc9M/z45ahSLfR8T46h4+8WM5TLaOFW62+4FI8Szk5wivESPBn+k0egC+eI+cPRb+o1E63fU6PHv/UFl7OIL3dy8wVwPIkMVSOgIrWgkbHCIVb1LceSRk4qoF4ARi/u3uXdgO7x0RtpITil281Y0MF/EQvfmFJeaMknogn0n2cbMIh18lRG6I+XuuuiLDjNmNWfoFZ0kG2+/udTJ6s25anxvXvkQG86PNVgRZofZo4gi5wcCcO/gWBRcPx8umD7cmePuCG2nN7Nsu8cQAA1IsReCouW6vpn2xiF3ucA+YxoIHunGU= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:WXbvdJVMD0r/yPrWHznoqn/6af75zHwMmFfDOPul0nzaoJh62a6A0nS8k4BPCyCJgso3p8jetyep7AaUZ8aJe7arBNx5cK6hMUndE9RMgGod0Mw/fqUP7US7tUkNYakis92cfMeuDbsiUKx0bmitD48QOv1mGyGrDL/vlPIl9LZIq+6A7ArvVPThQn+cOhn+x3S0s0ZAde7UHHf7FnlNJJ+5yJxHj2vJLDlMdYZnKpmxujI0lDuuyUPa0xXvF1gnryGF3Tblh1ckFFBwteZVZH0rP7MZzn4vVbPWkHe/HB2bkEDNXQq/66KCXYiwjDc2JFtE3JJb4R5TunXy9qsKDZxhqCF5X7zIdWmOsvKeHAE4JHwBx8/Qatcmb0N3niU1Q6QXvDqfneFGvRa5HWV7pw9JXwZ25Qg05UOMeM+Mp434nTQfXvHS5ftwUfvFUikDlpqwKO8v2E2wG5K9HyYoNg==; 5:WTu/pqxomoJbYsZv17pojefk/hMFkkhIn91kqwq3QlgEs+BweYpW0Uux71g7ZLS2xzWWrIHgB5DpEWwh0G5W5EkB7P3FqhLevayQNlsAQ1wcav8fQbM+3u6G66c9+5B81V276NDyL5LQbqGm01/m92Qx+Q77N5TjOf/Lt/kurFo=; 7:c1FTz0X1nnjZnLrtAp1QPDfAad6dEwUzbHO2wMD6aCDkRE/lDYPlhsqaT1QDS1ysjAy3tgNXhDDyDiqe/GNOMCYnZEFKy4cRtG3SMAJUW2s7KfgJ9ykoDFuHOKY3kEVHLLVHD+D8AHV8tvz9lEp98VW0ZxKBa+pA2Bi8VajxxEWeKf1jX0mJxPj/koVIegihYREnRPr7n5If2MkjCPzzFGXA5RlHR5qS16krrSIdOTTahF3dXsZzIP9rR/Ezf0sb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:15.3233 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3fc6b3c7-5359-49f1-12d5-08d60c642417 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142931_431018_48183E5C X-CRM114-Status: GOOD ( 10.74 ) 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.5.84 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh mac80211 does not allow mgmt tx to use off channel on DFS channels in non-ETSI domain, because it will invalidate CAC result on current operating channel. (mac80211 commit: 34373d12f3cbb74960a73431138ef619d857996f) Hence don't set offchanok for mgmt tx in case of DFS channels in non-ETSI. Signed-off-by: Peter Oh --- src/drivers/driver_nl80211.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 26df43b..0af109e 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -7178,6 +7178,10 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, int ret = -1; u8 *buf; struct ieee80211_hdr *hdr; + struct hostapd_hw_modes *modes; + int i, offchanok = 1; + u16 num_modes, flags; + u8 dfs_domain; wpa_printf(MSG_DEBUG, "nl80211: Send Action frame (ifindex=%d, " "freq=%u MHz wait=%d ms no_cck=%d)", @@ -7202,6 +7206,21 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, os_memset(bss->rand_addr, 0, ETH_ALEN); } + if (is_mesh_interface(drv->nlmode)) { + modes = nl80211_get_hw_feature_data(bss, &num_modes, + &flags, &dfs_domain); + if (dfs_domain != HOSTAPD_DFS_REGION_ETSI && + ieee80211_is_dfs(bss->freq, modes, num_modes)) + offchanok = 0; + if (modes) { + for (i = 0; i < num_modes; i++) { + os_free(modes[i].channels); + os_free(modes[i].rates); + } + os_free(modes); + } + } + if (is_ap_interface(drv->nlmode) && (!(drv->capa.flags & WPA_DRIVER_FLAGS_OFFCHANNEL_TX) || (int) freq == bss->freq || drv->device_ap_sme || @@ -7213,7 +7232,7 @@ static int wpa_driver_nl80211_send_action(struct i802_bss *bss, ret = nl80211_send_frame_cmd(bss, freq, wait_time, buf, 24 + data_len, &drv->send_action_cookie, - no_cck, 0, 1, NULL, 0); + no_cck, 0, offchanok, NULL, 0); os_free(buf); return ret; From patchwork Mon Aug 27 21:28:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962658 Return-Path: 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=) 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="ayB8FF+V"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="f7oORiLe"; 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 41zlXy6RcWz9s47 for ; Tue, 28 Aug 2018 07:35:14 +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=RmTcewP+9KSwjifFa9MWH8RMJTdRHW6+enjCimyz4tY=; b=ayB8FF+VPhqjGX xvBZ8hZGscPbPMvrIHjngM93OYhhYBE/nhgU8YOoDkTaur1WBlhDWdzGJpTZBOnhACBAaHO6pfP+4 RuJdan4fF/LmXuk6fmh1z8QZ8QMdRIfWnyBuCHlsVka6mZU1GFWv5yv9zL5EhM3Ir7y+T1HCbGrKm y/0frtzEHgqa2t/vlBstJXbOhOi5maxZZFfQLEGGu/rVxOvdwgOO5EcILSb/6ejCGQEv+ulJWVWnB vyZSTOjhRy8/TOBQ6Z9/AbhQND0buNPyUvYhYYo0HPF3opVabJc3kTTf89DuaLriOuFEgBtZ2+JiC mjMsJq5jXubL1kk5W7NA==; 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 1fuP9z-0001qf-BB; Mon, 27 Aug 2018 21:34:55 +0000 Received: from mail-db3eur04on0603.outbound.protection.outlook.com ([2a01:111:f400:fe0c::603] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4m-0006Qn-0b for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:33 +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=BT63jCBuTJB5a6OycVvjkmvBfzKo8XIkuUOFMQ8+BAo=; b=f7oORiLezo1t3nQyzzeN5STy102kHceNCcZ78ShSxAZoqRa1kK/aqNyLTxkZyqA9moWMG/EPOdSoLca5QWBOZAY/mrJZgvRdENa8nUy0HmXwtLk+wbaSKbzAViQ5EhQC38Rwkqw+rjXdN4OS/Zb+hzx6l3bKKBjYfi4C5/zivgA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:16 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 14/16] mesh: fix channel switch error during CAC Date: Mon, 27 Aug 2018 14:28:47 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ad59e62-fe37-4605-d048-08d60c6424bd X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:B8xOx03RwXyRV7GrfgVP0R6N31eJdNB2QD8OEyRY3G+wxLEG4JW6ZUnC+rOF1Et5bjhT0M0m+anBNLmk3ayPGo6NDm9gBQpTnxwW/u1gLO+kkOg41/YFFHY2lnV1dE1WA9iEsS0KrDs4KLy1h0kS6M7xyt2umo5gHtTDLJpMgtD1u330Gi9xaifyzCNjlVnjmJNit9b5EkBiKcWWltokMh5DEBOYmdbr4uzsoJluJcMruvdvGUUbmLosrvyPp5t7; 25:gtwuuaoMlakmLG+biAa2n19tedbXxW+vYUk69DBijJiHGFk5Vi62sjPb7HRYpfgHHS6XyBVKOOtVmCmpBtgjXDrNHv/Nk6coMNo/cNb9DLi0jIzWspGfQm9v/KZ8o8JZu8gwh365fKR5Au5oLBHPZO58DAdUbWefHfE8jCcfeUOqtA1vrWhNb6YRX2fksFr9T/mtnxO3CTr3gYElqDiLMQiVsxcjUjCJTbCB6AceH0Ab9/CJhJ1GM3oBIfqdfF4So1ywqo4xXSULh6/uimRLmLHHqQkyKE8ozZVaNWA9B4XKbJPnxe8ACEUzl48OayO9EuwDmfVFHRy2NLf3ETDFwA==; 31:pcMCKgGfEPZWEKfFtXPauw1NuPbUB0q8IMug+mMjKBiPEEdsKgaegG4D6BJhHg3OUWA1qmJUQVU/ksxd/PwgUTypu9vZ6bIhPMhchWNmR7d3QMVfkiQVE/3SG76fEQTC+H1mj+4keCXApJWq9eIrAXWaJ6UvWZ0F5Wcx2if0xLLtsND6K9fQyRRBqvcfPG/THDZnxntt3c07mk1h1esSlkVyhkZh7EziTGJk2cmjSqI= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:tlJmmaWDfqoQkWo9g5YocNEHcDy6wc08Mb290jfyEIFfh6GGJRZ/dHwG/Gakya7wMp0HddQaON3Te+gO0TxEhVY9Edy3C/HdCPYUmRHXw7mZ5aQxDAh5q9F2ua2rQXhDbQ8NKZ4Ot4MrOI/8lomT+wKWat/2eh+Rie9pccbdWzEvlmdWTj2eX3nab+/+wKall2Dre6LERX3R0tiBr9SU/UeeBosIPHl8lY7fT/qPsTz2n1VhEdXUdJ6yA5mZzAHdziKEL8I9BD78/pSzVJYznJNFqeTptAjbdKx6C2ViZeFC3sFN2agvk1Q8dSRwkpGsTLgU9LzDBv/r0grWSDhK9Gi+uQIZR3FThDhnwkGjBmjYt4ZLH3sKnXW643diJZQeQCGMOKnRwGqRWthKMGpmpEviKV11KKjdI8P99f2djkJ4XIlxhL2RWQ21BlqTPwiRpaT/F//LC4U28RZX/c3iTPqXwttt1Tg91eW+7BLN/5qCsSoMZwURxyFjSMtLWSd8; 4:oQ8sUKlNwF8py1aBqrB3wFuMBT9t2sQ0COmGc+ody4VJZHvu/gPsUOgs9tmgwlPPa+CB928BY5J0dOP4VUInLCtAKswoP6ATI7azpOJkf7f9xSin2ZOX50FajeM9UQ/hxVZm3Ue4cddlkwzCYjCMgKAGsPn9yH1pDWBn07VlI4FN8DZSipd+zlK2FENu3Q3TF+ZMRWMKrfNiLRHHD+gkGFuHirK0CFHhN3pa0bNIhESMn7/RUtZ47X4aSpN5eHWYyAV+Ix+mt6FPYC35Ak9nqQ== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:128czi3AgxgBHNuAw7lZ60SGstyxXPsIfP7Gv7kEZ?= VrE2/IS11hRdTHeAXMYMGy7+0O539qx2e6vLNY7/k+eCFlzVJtSkK4FpqtQUtWwMPj67cEItdPJom/TJWvalI4ZhRSn4RVveeF3S2AEuEBWJpaMDmLmT2fNxmdu8DZw5s9mvCNkjrktJ+4+JNs2KJYbI8P2uetH7M0wpHtQIb+ReA3ZD7g0l2mSOBAlD0Z6I5OucBG30W27I2MmtWICMgZ5sBXcpUkObWWkgJFWb0/SSwM0WBcFkHTjp72kldMnyZzOuaK2BptbFraIcYl36rNSvwMFhD3YP3GIGe3JfYWZPQAR9Of4VmbQpaXmAM3XPtPjxOAd3atfn9AdD4S2BE7C7Pz1pwpQyK79X1TpYnBmDFXR/yTG3VsFIw9b6kScN6EYbZsGrmoowKv18U/MH8rPtO+BQQ3QMeZnPXbfByXCLiuA9G6Tt5o19knGyORYChMN0C9nb4EpLZerLT0RAQ2T5Ct9P4AF+RPLb1pqQFv9rKQlzySm0JRd3OLGTGFs9xwaqSHbLAOY3/Pn6NmvqaQDgj0rEQGCBNmzf04NoRFpE4s1IijAavHrr86/B/Rbzo4Qiwu+O6Bftn9Fma4fFpzjbWXR9Ht9tKsX4lvroaK9UKmVveq2gxTmOtLPfB5Cvb0IFijqixLhtonfDhaS/yeSzbgZk73IFTRRPdioiqCsVfVCy6U9/LVWRqFTOrnSsnonICNlWfgwFohc8bVJmqVuRNwuyPIqSP2pB0402HV94L1CtEscSfcax9O5RGPZZp3Ezzin3FSU9wt6Nba/aKOdwmuC0t1PRJx9SmpQgJLxu14e/+DmjoTbLqw3RJ3NxI+cTNYqMcDgdtPBJv7pE2JV796I712Fo74wddRRlr9L+o9vKIZqT91G7hfQNukw+XfvHq0YtC5s87vrQAi0n5vi1LxMNZRz4jJnr/zA5uk0dTNgw6oI3geCZ0PlXMVCmbUqKWYcoxHw+UdXseq4SIqunxkK12UfGUR/YYIS4Asrn42aEoop4I4diJKNMQb954G1QbaNFt8fmtdWvDIjEkpj+PDvxYY3dDLxWwAlEmy6CooYesATZWm1h9MoIsqgfPEFx4/chDykNh1bQ7LEmoKa9g6QSDNQ1CgHBvxsCoZlT6ok4zRnK/CS7jLW4sP1wfuLSlYQB5H6s6eJwC8m4AghrM5lJTksyr5zUSP9yp+Bc2nTmMRfSzsL09sj7Kz+fUNjwictd64niQTc9XgHje/g2+lOPBA25pFJwcJ10QcJA4C/oA2IlVLNZgY9lww3QLA6ZK1UGG5Gs4nQBaIOdW/HJDgYlu4PgYR21Y51ipAVrQ== X-Microsoft-Antispam-Message-Info: 5b9lPtIqDGQPBmJM38zHP5U5axxaCzkWPQNeH9TgUVpsjbChDg3iVT9Aeu4VTLx8dksjziPkzc3iDlLwxFj60xt76aEKL52GV4CQhRCcYyWN8tsPB6SB0aPBBdiogiEmMqexKJoNjyi5WTXbTSpB7xvFqlZE+jvNv8MpBwhoNIsiVV/QkNJX6oLLq3QGXz3lcplwFQRycuAoyVtnBt1qYZbDIYxhAqxZvplc5TbU1DnBbXfs2iaaZpnVPn2NbHQle7s6QT3cDHA4keu9aKPbJryY3PEEegF8zVaTD3wNQOtzn8dRri6Rh7xicVzVZkPpuj6SZpnxF10EjzC3jeVP4c/IvCdExya8Bayqai/RoF0= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:45J3d+JC7srZS/mC2wVfCa/oMn9mJbeTiF2tuqBlKCTkmPMm9HRga1vIXFbZhTQDuHix+k9JZCx4YxuyqpZwfHDzJCf8pj8SkRDW+YVuf6nWM1dKm7cLdAZP8Vw1VLidm4ReDGiyizaJNn/ifmawo0WYEKnDBkkjTM0A4Z3qqxRnIB10L4uc7vIw1dNNl2BNpLT/Yeh5hpj39eyfOmuoNGVfSD1umeX3mKorC7QNAtGt22PKyYUivmVONaPF/b5Fpo1ZrYX63zvcKKfElJQGxcZkAGksqtadWHu5k5lvixbxmvIEffZUMFIH4pXVH72FN8ehswyOxlcJo6h/2cJXHd84WIbAsV2sswyy7RQAdQAxsjlyPLwlqr2wauIv8RFjNR1dj7y+wG7X7bkNFXjMtWcjvSZlMsx7CKFPeGgqt3Og5eMO+wM8Ib9DeX1X9tEkBk4/2j6m5clOG9OiV9pLBw==; 5:ApqNKV9slN6InL2VgAm3OlzW3njOgeqF32ZhJ9Tp2+34xQtSsbVnzWCMKf2WMwwWNLbwWAshfEmmMSIdDBXRr0Ib+1onOE60JpKo71Sp6Wcws26Fk/bZ7StrGKUwX73sWqAFV/QNvg0m1Js3R7H3cXbFUg7qtJBIR6W4/T/QYLo=; 7:jbbJn3jWmA7eoWz2QvodT4bHWB4gDsavbpYpFTkGFxYa2smCz2UxYfXi7tnX2AX8KefXG1jZCVvuHMQkHiymEYf8aJjBttH6v3c7jFcaZzsGqIRV42ScwR+DiKZ9nagjDBC9+IUb1DPZ2YNcsMNZKjiYIYDoneLlfwxfVSVpyTLUrTYIFFlBTglYjVPnFP5TKR272ueCS/NQAziqObFpdl5zNeW9LAqGm5Cezb+rSQLtHBRXmZ5mCmobFqxtpGD0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:16.5591 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ad59e62-fe37-4605-d048-08d60c6424bd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142932_156869_A825DFF5 X-CRM114-Status: UNSURE ( 9.73 ) X-CRM114-Notice: Please train this message. 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 [2a01:111:f400:fe0c:0:0:0:603 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh Mesh interface has used its channel parameters that configured during its initialization even after channel switched due to DFS radar detection during CAC which caused channel switch error. This change fixes the error by updating its channel parameters when channel's been changed from initial one. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index cdaafd7..a714c15 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -13,6 +13,7 @@ #include "utils/uuid.h" #include "common/ieee802_11_defs.h" #include "common/wpa_ctrl.h" +#include "common/hw_features_common.h" #include "ap/sta_info.h" #include "ap/hostapd.h" #include "ap/ieee802_11.h" @@ -199,10 +200,35 @@ static int wpas_mesh_init_rsn(struct wpa_supplicant *wpa_s) static void wpas_mesh_complete_cb(void *ctx) { struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx; + struct hostapd_iface *ifmsh = wpa_s->ifmsh; struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; + /* + * inspect if channel's been changed since initialized. + * i.e. DFS radar detection + */ + if (ifmsh->freq != params->freq.freq) { + wpa_s->assoc_freq = ifmsh->freq; + ssid->frequency = ifmsh->freq; + if (hostapd_set_freq_params(¶ms->freq, + ifmsh->conf->hw_mode, + ifmsh->freq, + ifmsh->conf->channel, + ifmsh->conf->ieee80211n, + ifmsh->conf->ieee80211ac, + ifmsh->conf->secondary_channel, + ifmsh->conf->vht_oper_chwidth, + ifmsh->conf->vht_oper_centr_freq_seg0_idx, + ifmsh->conf->vht_oper_centr_freq_seg1_idx, + ifmsh->conf->vht_capab)) { + wpa_printf(MSG_ERROR, "Error updating mesh frequency params."); + wpa_supplicant_mesh_deinit(wpa_s); + return; + } + } + if (wpas_mesh_init_rsn(wpa_s)) { wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh..."); wpa_supplicant_mesh_deinit(wpa_s); From patchwork Mon Aug 27 21:28:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962659 Return-Path: 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=) 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="eCOfDGau"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="pf0cHCxl"; 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 41zlYJ3DJwz9s47 for ; Tue, 28 Aug 2018 07:35:32 +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=U4M8gNvcbqK09QbT5gRPDsLoi96LYGeeOrNRhIT51Zw=; b=eCOfDGaunAA/eU cbTFyUhmHtwdGYohgo0d80aToHmZMm70Z9ddi8i7zX/6fkL0NPKIU+87wzaHLxYP/+8I5SaXzfhlv HLCtYQjxHy56WaBuS1DL3yN4hAFiHPgJDoAfG1wfZJrA876XZAl3SNkdhHDqk8kkAmw6jbtQXK5OH iNmysPUROp26CdPOqv7c+uKWYrQ52UlXmFnnU73I0VCIyHnLh1hlHHP4QEipAnXruBCA0AABROP1l 6mhiOz/oayKf2Bcj3yVxL+1ESDTwhL6I2H5n/sRn0ZsUgFfY47i8Crf0F3XFva7W0pwd5ORfzymAo yErSFoPTR4rk7TbzaflQ==; 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 1fuPAO-0002V3-It; Mon, 27 Aug 2018 21:35:20 +0000 Received: from mail-eopbgr50059.outbound.protection.outlook.com ([40.107.5.59] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4m-0006Rn-Pz for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:34 +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=98I2qkJYG4YGPaHhgInvin2w6XCWksLIG4woH747rEw=; b=pf0cHCxlOFduyUjN67Yy3LAyUEaOHvUF714JCZT3850QSjV3cI/CmTyjKqQ90cfE4iy+OxT3Cz4Ql+DEj78c7BA8dV9QaWMwhFzJU2dUMOFlKdurWIyGof8zoGMaz983KpSvn+O2ybGYATjuhmt5sNpbPLBLgpJ/iqaHx9Xh7Ds= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:17 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 15/16] mesh: don't allow pri/sec channel switch Date: Mon, 27 Aug 2018 14:28:48 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d10d6a9f-d6a4-448f-ce25-08d60c642561 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:dRrN79hm52T1iHtGQRbZ0BJpOjCdQouSgkhSKe7m74bxjq30ktZwQ3n7SdOShhW9yCoKnQDFSsTj0k6wpP5J3qaDtYRqToeHUswfQ9CjymATWfQXLnFUHU9jkX4xk/SbWo3Temd2IH2glnGk97dYSli2zuO6l7v4Uta88PkQ/n2id7UrxgncHd6ePi0tV73slBXNK+LaX0zGu+AtWCs9/HDRflOflstV1srSSE67tMnHB76XFka+/Ipu8JG3hWi3; 25:yinnvE6uP+LKcNihJFOAS+BltKf7z0lNRRgToIXomfkxLqgbp8kfmrN3gNehZNmiVoFOig9EVtZB1aO4PH0gtwntvvJM5EDe61zqXiPv9o7dx9HNk3y6azVJ/7otWjHlCKIsVXQUHYtTyM2JbEWhGQ3YjZObDsaMZXUnixwWk4t+YjJo4DquavB+hpe0YbGtU6Dt5R3cwXREcU4YOiVN96ZinZRU7D4ca+ayFo6DW8WH0qCWFAIAxPuWnY5dUbOZPir3zrnHSxApPIoaJFVNyDcPmYMXicPqX7+DMm3oCD8Z+YDdfOe9slXtbAzZqvdTTkGsS06gJhw98ROSwNV7ug==; 31:/eW7Fn2xVdb/52pIIx2m1gKYwdosgoj1P/q4Jvr7+MpoBvIy2Dqsbvr2XF+McSAvDhpY0gLW68+6KT+X8EduGRC4wEaxyn4TAkUiQyn7ZN2S9TZs5xwqKMrfee+XBDdkW4TnI3CITCXLE44D9sSvZjrQAJm1l+b7EPuhXTH9+pq9YnT8BAqtxZ5/hpHl0yzFigMKw+9wVQiY2AUFVCV2kgpEIdzS/4Mz63XokSOTB5Y= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:+4H50SWZJX1GC+94jwa8d7DWikJniXfg8ZL1olaoASh+yR6+UXS7EDSEDJs/KcH4TFPYppnVOK4emMy7bC7Et+2dl8u0RHt7pm4OaaIvN2PTG4/T5EctxYZPOogEwqbOQsRL4Dyxdex4tahVwB0a7NdcreJBlhPNL55nqipZ4v4RTWI8jSWlBu3LNU8sq9QJP+Yg2KoBXD41ak2FPcrtGKMWH7oMETuf7ckSKyuo1B9afSjqftNYWB/xbvIaj+XYbrZOYMWQqaXxqlp74phFr/SdPzJBvdEi0QGgS6UKml6vt1g6gZ7JhAN4XmkNiW+CdvrFfUmJrgSqxvIcDbH46NFHIQ7HS2HWwJnmivyXcbFKNbh4s4pe4WIDtQPF2EUVH1bR+V4mN8VjI2tf1NWA2JfDb1cUq9Yc6h/awPoEzij9qKlRIqhrbF4Cay4G4F2mYgnHwcBUFLoLfF20LJrFKzy1Xstf6W2qI+2AsgbRUVOcE8HE58kFIJmwLKi/ocgs; 4:fc0vcgf0LHePKcUeyeFOBUw/n3gGaSYFUa4tkAeL9jUG/9FWxfpiAqso3z9acoNhYHZdSzYSkgO7xFISq1a9/F8ZWReP/ZHNEBPAyrF0Kae95B1bANqjtJLTFIRIPBFH8b5RX6MqJUQcV5Zn7wYHWj+li8HT0ZPCVgDM3QUoJSLUvm+QFDErMyIFg4BeIIE1mj45jNBekxWScoKZMELWE2KU0/HHDME4zHieQf7iD2S0tgau4iali6dW0Y2s6cMCZxPIJvJIV5ddQ7grvxrl6g== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:dO6OqT4ymOcBaA3vnapost7Am2YJ/Aok1B2vPyoIk?= v4IhilbvLMahVmbwyzV1eb75Eh1CNvE/d9RiCMKcgDhmJmWtzcr8DvdJXpl1uMGbHPnTfpYnuMce4YFSINu5ErGNW4Z8MZnI+E7ewb4Sk61MGQ/5srUumPqxSM26m7MaqQ6EnsB1kX4AqdTaO46TjlIurZquzKcEj+30Mto1g80uktjJzwMO8nfy+XNLR877wWFaTMlQB026XclyN78uNjlvX8LUsHn5koVYkqYnQz1fApcDtZ3bSSubyvk1q2zI/PXa2L0enS1ihTBOTM7SEdrJLC7rN98XyNVYysUHI8ovepliB1rfRJUy6GWRmzuRUHWLHzbsV0A93GfyjPtaCtqwA+fv3rqtkayC2N2pHEMyWvDsh8gv02T6WHDdghiIex6LqPIDhME4PajyF+f8fVhBynvuchyCK/bzQfDJQvHRXgb4A5AHhctDkp+mtvJoZRKjbGw291mKZIWEmnmqHtOeDgVc4g8iIFRXpn9mA41RjaTaMTH1RN8ErVZM3Myt5VcqzKuru2qZwtB8PIWFon0h6hGtadiEI9KU+pEZcEWDSVxWoF8/QzppR1o2Oahyg9POdvysOpJZ8vHv0ZgeggVz+D6ygHHhwq6LP7nmUjTxq5zVNkJM3RajY7wy0UvubtExiKHb6d9UCXdSrkKe3M/poqSHzoIFPdO7glefLC2ZybsCLKiSJVzrqcTotlRvBduuDaTMbY8WWu9ijDZN9XyggaKEmv3i5PwcQPX8UAsmZLgdknLJ4ZY/fMXfUXguU/g2PkrMrBRcmFlv8BoNC6GLA6itnB1VI5Sp2MkgAJMf98i4/Str0h96aAbDQ/8LBdQ9Q7yGd4CGTq4HIsrFyF4FW67g3ROi7PcjVEaH5uR9H/PV9c4hxpobtkMmHJDUrY/s/X1OCBlU076g8gTYkxrytYo7qfkGwihV98lgB6UBCW8qMAjH0XAXfGYsRk1rszTfAGfTcphivnd5zi2/KoHMa5vTjZ/BQ5RRh6lz26JYM7aHJuopptdzgxE7pYpSVbA/MQQWTcwU43KWaCFKXeb8Mg5MplNsLaD2Yga0Zz1/XH06WpS6vyyDmb71DRdkgv8i+zh0uv4UH1g3WTSNQgPNGWuNNfB4kcJKhvApugeZJ0x/fx+RTHesjpAI7L0+7CNe/J94daC3kF7EqHMvLe0H6AM3WXLbkJm15lbNoHluLljsgLjXcJY4Qc33k/X0O22dQNXeYfEqhKlZEkgQ8/x2E1KGc5fqvYHVGXIWVYtcT+n3i7AAg+1QXJTxgXj9LisN/z0qnKSx7+MaYrwPTRUhr9LBOyN0vuIxSQaeQvapA== X-Microsoft-Antispam-Message-Info: QppXGfYosa0T8DEqT9Mn3/aLh5bC7WohWujaRhBdKHgZoCxQCexVQpB18fDFdJMQecwMGsc1yxCtcNihtQ6W+5EXkalJSTiSL39CHeCD+keNGH6jRFYNcGFDiygnLRPLPkR59hd+yW2giFdsUWuAqs1P2kvxsUbEhysYkrNtRgQh6IhWlLMyg8woHBp5MLo3K8NQpzc8eMrRPwgadVAuUbEbtNhN+l1QCKdrpqzQ3MmHpYPWG0xkIJ4mkkCDfc6aglOhoGrzriXurU6d+cgICfGQ22mSwgR7cgs4rda+Q7vYEEy9AmcnxFH6xfeoIGaQ+OI4OgHotL3PbpIYPeDHvKNkP9S9mP6UP+6XEOhF25s= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:sOkSsvWwdlYuD5uzmtiKaG0Pd66rx7ZUgckrrt4Es4NVgcb6c0NtnM7BmVmF6cCIhlYwmbTtwwXKl0plYyXyihoAglqWe5WyUaOc5X1O3deMyO4abtOLYUDLzVKM1rgnPr6672ZoB4JQDn2CAM6xUnxad1J+/0ezWHU/jk6NmNNu6AvRsHPGj3Fi07TyllJF8205uMGVMBLEgZX2lDJ381bEw6Cn5PDBg6jvMyn4uBleO0gVDB14BDj6F1wvmvWO73W/c3wuDUiLceGuJt+LRZmQTfl9b4c2GMSgY8qnpoLtw0yuXJ9/KXrmSWY/+j2xcrdiq8O8bFpmpcdQ4lETJWrxoymiLp1i8zD71mnM/rflGdN+fZtqR+Xi/HmIGIPP+udkm/KTR9Jc3KUNp08zsYwLPLR9EkwwLaCOlVxFpiQdE6b5Zsh/kBpqoNt74+UhOyRsBlhUKsovVaGEsc6mRQ==; 5:+zOc4WUW8CeTFiOcB9H3WY5G38kIR4emNKZFW4yQoSZhzh4uumEIDIO7LV49XW19v2O9vh4ss9w7Hvr5P6bDek4ZmqGaGLEG25Wqm0CYFHHUFUNh7Qf9nrunQ978U3U2895hBsdNbwN7pHJjNhV8KF/ykRqYvX9ougvrNs64/k4=; 7:fhClo6atW1RYcO2cqgkgBNpRiUG4UbjS3Uo+x487fE7aTgMQfPhKvVxAE6PJmnP2qafc3xikIZIWsHcSsDYfwpRh7HcwcegjEP9eilYzeMSeItED10L71B3HeaVBE4F8VPyX1RvyaUR+768EL5z9Afw3Hv/MIC4Y+8fB7/1TLCtKWcGgdSYVPShAceLGBA/w8xjQx312eStKg6q42qj/ArUsKkVPJU54su6ErYL0uKvhrwjom1puJtMSp0fNbM/s SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:17.6309 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d10d6a9f-d6a4-448f-ce25-08d60c642561 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142932_923453_1A2DBA43 X-CRM114-Status: UNSURE ( 9.20 ) X-CRM114-Notice: Please train this message. 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.5.59 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh This limitation isn't backed by standard, but it is known that mesh doesn't have capability to handle 20/40 coex change in current implementation and it will not able to establish PLINK when channel switch between primary and secondary happens. Since it's unknown when we will have the implementation of handling 20/40 coex change for mesh, it'd better to avoid them from happening until standard based implementation is introduced. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 1 + 1 file changed, 1 insertion(+) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index a714c15..b4b3ae9 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -407,6 +407,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, conf->basic_rates[rate_len] = -1; } + conf->no_pri_sec_switch = 1; wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); if (wpa_drv_init_mesh(wpa_s)) { From patchwork Mon Aug 27 21:28:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962660 Return-Path: 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=) 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="JDSAdgmk"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="daVZDtR8"; 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 41zlYs66b0z9s47 for ; Tue, 28 Aug 2018 07:36:01 +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=MmarvKXH7zsXYwKCUbyQX6tMy5IXAXJ+832Yp6t7cz8=; b=JDSAdgmk20x6hw trTDhw5ZZpZf8BDnrtuKQLCqTmE5YjsL6E0ywNV/eYFrAPJ3fqFGyxWlgHmgBSPNBU0VBtjHVriQr Vqajq1eh9HEWSWt452at5sEbTHLLR7QLa6d+7ZWoDHUK2vCM1j++fpmgJUZbUJC9tJG2otGO62ong M3wBxi7rVwijA0x347mzIlOniENyLTqT0oJhoiECJ3Q7yHI37ds7TA2Qkx7zYx1WkYogNX+9s3L/5 lYbqoyoXaqK/CvqG4NL2jdu4zTAGSaONAn6FM2iE7J1joGxNx3TVGAxkxETQLtbrBWZ29edK/eB2a lK7vHGnTZ2b37VDH67sQ==; 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 1fuPAq-0003RF-9z; Mon, 27 Aug 2018 21:35:48 +0000 Received: from mail-eopbgr50084.outbound.protection.outlook.com ([40.107.5.84] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4n-0006Rg-II for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:35 +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=Bi4UFXTVj6G7cRzSHbjIDTtKtA7CmlSOEjKoG77H7N0=; b=daVZDtR8jb+5DysNw3uLzhCT2MfRKNUAkI6O1ZfSFDYr3CsesiQtevu9A7tSzATzOaEThFNYyQeNXn4niJ9RTSR0GX94IaWJJPVls8isJOtHpgn4ldAsPcxGHl2yrBy3rw1k1BpewCOEx0oWfe7jyVX9mZjiIDooSuiiXzy/4c0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:18 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 16/16] mesh: inform kernel driver DFS handler in userspace Date: Mon, 27 Aug 2018 14:28:49 -0700 Message-Id: <27dd195e3e7781197d0bb800fed6ac589dfc79fc.1535403927.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4986228-8e85-4cfd-fdb4-08d60c64261e X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:w9LA8TOgaYDEeUUlA0T8ojUzaYZf3vVxh20xsCu/Pl6gtuphjwGKMBX4DjdMrjhSJ2iceH0w1sAqnvzqmTe3lOfYfMSuJdrLRzY0MSIYBZiqIg23oLG3C+a+UuqfGasG9AxqOrXeCCGkJ+uYWC4hyG55sL2KPF995foAIntiTqGaekUOkiLsIjhlznlY4uykitx3UtDJlgDiWldSPm85t61CvJ1vVn5UkkF7G+3DPjccylA8OVpGZj2Si4RAi53G; 25:jyxyHAZK1yu9TlJy3ElqrV+zbS1mbFzCiV6LdziefCDLEy/swvdQSHh1cFOL+txv9uKpnb2ur1mfqU3Uy7ygLxZO5ek3rb24HKv2kPmi8QTLaKRyZm2R+IttGTGWMRX7e92YX9C9rQGpLl13tW9/z49oRkPwujFjhkWWeHdsPtVUpgl0o2HpiJDkuIrUgM4emt1Y+MBbf9hQXtTRWLvxk8wf3mezmGGhGLpNolH+IqCI5sFHTLukV4Z+3smf6VqmCY30Xmvkf0MpFAEf6aONY9CE+fO2SWan2imXKoRK53kC8Dg2qQhveOo8IUcKuPud8J31yhyN+B2fAs+l677LcA==; 31:7WCpBwhk4f5/WEBvSdLxDMlyEv8uEz4eIx1dAIUHiZzTeDHEICaXcUkirJNV/6O7OWBE5tGfbsJC4PQRwgCm7saJmGZr/+A34LEhITNGFhmIiODfOXD+Fw1wqOwsPrYDK8JyIjB9Ldpc1ET/X+r7KV5bWUNjBp9ZovkyCNX0P1bmf6WXNqmxGuqAUjVhjcgyW+kHmBXFl4BybxvzG0mt9Dc2oCHY6d5XjkQEddIw3P8= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:HDzZD5ySFT+Yb9Uqb6+fMP/SNZG/inSMTC6BEpnPgJcEuQA90KjeO4sltbB19BA8YaZMnyeiSjFR23gPxLDsL/ExnHABLX/Zo4hQ+ZzqkiyWyw+Q6NzGTdYIBSa/oD76aSKspXo02YDHCiAsXWeUTtjk/EJQ5kNqfBWyrH9UXjvRtkEDGIcrmUljZ1L106U6YhxhTbIlDZAdVnOmrr9d1avDvhbAe4wmP1RzPP7s1stAG5UdCXogRucoQK994PbLnpFE0uEcd/p8OWqv3Ig/O10f0ipdzljjJ/arUKnqPjaQCNfmFtKu4kJ19qeY2p9NvSRwpiJcegZ6dh+vISs7kmq+KtJQkQsZ3H66M76BktjKaUBfv7DX5BpjuSiM4OrJap8fchS8vdrFBuNzgLELCjDzXUbYWsaS5tgn8ul6YJeqZ4x+lXOo9qgMp9O+WTl9f1FGYnvn6XOMYOgoY5f/eMz0BekACzE0I3jS1R63/v8vzC04Ely48ZXNw8BJYjUk; 4:3/W44P5qjJ9QMcneEeRelckLMicDuGSHY3gJzRR0F/fgs8sjJHWcb6hhAc+aGARl49Oy6rQl7zFFgJUPkrxpHuqpMWJgWv6zN/p1Fzl1niK+HyZpJ4js93c235cXXVi21+0thaznt6b68cnPYgqxscf5T0drvaA7inHxtVcQxFuyoFMsXppninUa7/jsonpQLFX3sd6GAruOd/DIVQC4kehLnRIOeZDPRjU3mqql3iiboUJFbSYE7oBMXXI3lRdN89A9hqrwkKdGRKsK7LhY5w== X-Microsoft-Antispam-PRVS: 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(575784001)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; 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; AM6PR04MB4151; 23:CuFTs7AYuEsmv5Nt2WovUAfufkcyDwqFcoZ42htS6?= dn9OmMSNs10134QIlQbkJEKPg7llGT6NHf9IYKNJ2+AjBkVWahCVVyrNQ5Wwv5KmlGUqNQcowg14hDPjn+jjYMkAY+MB0Mi93l4BCXomhlv2IlEuB1kGrbIF34JJHhzd0wJ7OHhdrsRK0A0yOe1VkmLalw1QVPAkQie3+QvBYf4/qN2H7xVINqL3lKoDXxjuxIl4+zkaq9XL8gkoa6C25ldolKWKfSubtVaABOpq+j/lXwEaUrkFHBr8ROrMNviZkhtWkWcVqU2qTCzIXJAR8NMz2M+kl0Vfh/C/VSSuWtBDQmNr89w0Ni2Qb08wTYBwjTetskJfIKO7d8TO8AzJTetNSAxg6HRP7E564i2kkrbf+7Wnp4bI2Y1KpHerYqfKRh91T2RDxeN59mKlur8VmCcvIK95Q+7re4VcKsqYw6MJTZwFNP3G6iBt4KWDjY/+vyjB1CkyAMaPA7ND7ZJP+x6q1vnwdw6Uge436Mmu2V2FDjNtHeWtSHs/8BtZD9avXccda5fgDV7r0T5d74h8Z1in80rTDnymCjODsnz9d04LnY0NgJw4mRFU8ZKoCHXpQXMiFsqvRdpUa5YlqYFLTLTOANGR00EsPvlOJSG78PU0Xevd32xN29EfAvJKXx+rK/DKod99p9Ie2BQrYkrnFT3y4ew3SFKM5aS+40rxcBeSXtSI5FOd1V1i2Ie8nFbgH+l5o0VPU6ieJ+2jPGOPU+aQSSkXHuzNCD0/kRseDmz4QzKHIQ/T6whDK9xvf7RXQa0mRaU8HhYHVz7AiOwRnKqD3c4/DqVBo/sZ/UWCSzyqwcIhgWrdMyoOSNbVEIcZ5EQM7v5mOmBH14G8e+7ON8B8zgsqhOA/727k6RyuxMQ/u+thUlAK90gUuFL2knhKFS3x+PcFvY1fT91YZOlOdcJK7xRN3WJuXVJQXstjopRT1GL/DRyAVdL1Q3l/sYzPb0lVoOhp+nxuyxdfHwaLbXj/5+XdiOU+14ViX35UVPKcVzHiu9eBH24TCRDs1oXatnuiNcyvTjRKeqzFLPykAf/010HCSjDGCoNNAY7gB96oN+s8/W0mAm/OdGBLT/crzBUC6dGmznoXmUxJu+pwTMXMK0c7J+KFfUenLCkKu4hCeAlFLOZ/aWEPra75Cn7IrnedGSVjW48F4nHGKyct6JMDegeABlUZfhcnl6ycIDSQ34DCtbnHuAeWQh41lk1VDtOPAFvhW5lv8iVL+DyL/aWiJWqbNJyIdKRkONK8eQVkWdDRZ6S7SGT7xXtvIlx87+MtGigUEIy1wx3ncrBCreK+Oai2EYOuZq+too70sTA3vpHmV6U3I5BY0nxriXeFBoatMMnPsfW2y4Lv/RxInWN X-Microsoft-Antispam-Message-Info: 8rijZcD1l2bLiOHHuYo6qQ+mH/b43MsR7ao57tJpv6dbmGHAqyuAEsf0WaPLgJdHne7SjdUPDONMZovKFVS02Zk9wVizV+eaZLxGs4ROwI8QlGvDzbv8vi2JyaRE0W0ByG3rn0+e5ebk3qArwsAV3JXc9CoBL10LKcVBhFtSntIZ4/doGPqP5mVRhr+9DnJxDlNOWoNXhPcXVTWgFW9uK6eYT6nY2wcrz9uKNU6Us2u7dM0DypHjjcRJNVQ1nRaqSxCznNMkVkGkzfaFojWxS/hlPB8eYnND8Lkvn3Wvt1/ydBQd7H3RyVU1fNYP3TJ5piF5spCkPm0hvja3jVf63hfNrp1TAL0ClCAmvNafLig= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:lEYTS7gjpk8gjO100pFNTQ66dDOAUsaOs8EWXGCe9j++KuT2aBNAipk1/ZaOlaGXaqczRrZb2MvCqr/rtof9bjtRilVF9lzDKjdexLmHI34UeNS5ZFVeXbElIWPBJEXDpT+d3f9heF6FPHKXQUJaL8eSIevQGJOw4gzSwCyZqwl8oGKMrIj0A5vTAALkNrTsE1OcQGbX6pKb15rdTk8foeOqOI/awt/e5r84BfobjNegBm4obbCO3ovsq+CqNjWkYFQTd8F44Dq214GGPWWRq0dU5DMcCr3Q//YUKirx0Q9pk+jdRjcbRE7njVafFPt1OwYGLzkF1CECGtj3BLgabCp+VHMwisgzJzqEOhVlf6OAWPowIRwgqE/limGbwbGZlw0v6xVvOJybNONKvK2BSxMBfuaZK5+qTZiPukuo8uiAegwZHTFS/AGW6IY09U4OfwnpQamvcRoPV8prO8cqGg==; 5:9HB7t5/qTjTUmx5VMynZPoC6pVwK0ZuO8JqpBOHi+O9RU5wz7xl/v3jFylu0auGS7HIVP8WTqLJJLmfIK3hAou1yFP8x8zlVDfUqkzFRgC+JKHwINFQhbSNdgLopZK1cZwRFLiEpm4Nb9BscdfSZyF7IPxDAbyGzusYMbF8ofUo=; 7:Zrb8cyUXjc5OLVuedBBTtrvYdXWyFl6Gq7fsTweSQOSGecz40nBWgY81qNeSwLmW6BdU9wB1pXOaIlQXMseUoGilbMkXqzsx7fP7nzYZND6xUw+n1/XorKS7xtV1HiVA7vYaN/tHcw4HNtev5W9umjfoX2TOXMr1u243I7jV4yp7uxCvOv9u/HU35t7YT0DrcVNgyjqJCrGeEMapwCoZsixib5EtHzLocRPb1jABiFZyiKKwnavDBgzUrrdfCP+l SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:18.8247 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d4986228-8e85-4cfd-fdb4-08d60c64261e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142933_669129_A3712F0B X-CRM114-Status: UNSURE ( 9.38 ) X-CRM114-Notice: Please train this message. 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.5.84 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_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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh NL80211_ATTR_HANDLE_DFS is required by kerenel space to enable DFS channels that indicates DFS handler resides in userspace. Signed-off-by: Peter Oh --- src/drivers/driver.h | 1 + src/drivers/driver_nl80211.c | 3 +++ wpa_supplicant/mesh.c | 1 + 3 files changed, 5 insertions(+) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 9922962..8d0b054 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1390,6 +1390,7 @@ struct wpa_driver_mesh_join_params { #define WPA_DRIVER_MESH_FLAG_SAE_AUTH 0x00000004 #define WPA_DRIVER_MESH_FLAG_AMPE 0x00000008 unsigned int flags; + u8 handle_dfs; }; /** diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 0af109e..19e88ae 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -9303,6 +9303,9 @@ static int nl80211_join_mesh(struct i802_bss *bss, wpa_printf(MSG_DEBUG, " * flags=%08X", params->flags); + if (params->handle_dfs) + if (nla_put_flag(msg, NL80211_ATTR_HANDLE_DFS)) + goto fail; container = nla_nest_start(msg, NL80211_ATTR_MESH_SETUP); if (!container) goto fail; diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index b4b3ae9..543262c 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -332,6 +332,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, conf->ieee80211d = 1; conf->country[0] = wpa_s->conf->country[0]; conf->country[1] = wpa_s->conf->country[1]; + wpa_s->mesh_params->handle_dfs = 1; } bss->iconf = conf;