Message ID | 13ac70dd46b39d4825be6ddd1e86261407f3edad.1527814610.git.peter.oh@bowerswilkins.com |
---|---|
State | Deferred |
Headers | show
Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bowerswilkins.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fR1/PI1F"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="jJJ/WME8"; 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 40xmLm2MZJz9rvt for <incoming@patchwork.ozlabs.org>; Fri, 1 Jun 2018 11:04:16 +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=T/YwNu612BVCQQvo2BVE5DhP/hgPPjULNf5s/VUpWeI=; b=fR1/PI1FhEZgkE f2p8Po3j78jOYJ2MXiPnXQZSqCBN2z3Yb42tLRcboIo6GWwHcNDg+Pz5lsdpu/2YIYdLO0p0HIxk6 dpEaYE1X+yPQZrmgE2o+jippp7UDEKi941Up28Mp4UxXdO+sGkuc6DidZZOwGGO/ZI2xKcpqLNAOU feANDqlK1hydTO32HW/2+pZXmGfu4dKDpqVUEK/nK48GHjiwQbld1xV91CieceWUPpMYV377ck6pI G/T2Mkx0qdghwR/IcyQ/BLtmJSjTf04k8/YODhsCZ7cEwLsBtoeJMMTaka4lEeNowmPd0gAaxcPrO aFHfg3BsiHSb7Nw7RIew==; 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 1fOYUB-0001Aj-PF; Fri, 01 Jun 2018 01:04:07 +0000 Received: from mail-eopbgr40085.outbound.protection.outlook.com ([40.107.4.85] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYSz-0000NK-Ix for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:06 +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=UtDtsdBTggGFNw6DnnAYtSL+qj1BdKVBHNbVDmeMBpE=; b=jJJ/WME8pOB3N3YBI1iZ/IzZ4DUA12kJBglm+Ql9oCybmlMsRR3klpSypo6hRgmE62WBa+//erk14c7RK3emXqfHTClhIIH2OKniUmMqZogOqfLm/0WBzw4QPlUPiVG6fTC+W5bn7B2mJGqpLlv0ghFZvXWis1uvtrPuIWS0UcA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:f8b1:4178:69fc:b611) by HE1PR04MB1657.eurprd04.prod.outlook.com (2a01:111:e400:59aa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Fri, 1 Jun 2018 01:02:34 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 05/15] mesh: reflect country setting to mesh configuration Date: Thu, 31 May 2018 18:01:59 -0700 Message-Id: <13ac70dd46b39d4825be6ddd1e86261407f3edad.1527814610.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1527814610.git.peter.oh@bowerswilkins.com> References: <cover.1527814610.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:f8b1:4178:69fc:b611] X-ClientProxiedBy: BYAPR01CA0007.prod.exchangelabs.com (2603:10b6:a02:80::20) To HE1PR04MB1657.eurprd04.prod.outlook.com (2a01:111:e400:59aa::11) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR04MB1657; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 3:/Bkc1uuurBrfuqeesCWv8FIB/VTZzXynuviaOjAeV2hJUiVNlxxlv0GCRWpK1RknypHtvqN4rKfEjzb69OSKj/llmbE7s6Vgjl2gOu0MKdNNVo8gWwaYGnCyQLTWGPVU51zvB+gmPGGB1umwzuWa/q6EqPPXJ84g1sxQQR2hwmJ+6RdS7G/xBDZ7p+YvPLHrbFCjWZV/adJycqdBMNObTNBFKLCDvitwubFASfL6QY7lhvJPA6uDVTclWvE0qnnM; 25:gUlabS3mFuAqyQMYeJHcf4hXr9wwsXvxkcGpbGvGYNZ/kMq2w6y9a1Rp40UVHd24JjE7Oud3G049AHxLK95phE2UBZSbuCG2E/qP5e5y8CaGiiG6dgy+im2+ymZfR7gqQWxytiNdzh+WMgDLWxGUqN5tvLcXG4I4Id50ZfNCFgqBNCebnjvFFEtwWEmSMP06vrw0kmcj6ac0AtX9jzq7j0SmXU6E2RCK2T5X8DA+3TklDsin0fQBa/kJjmOmPTE03LibNoKSVUnn+BHtxxUXokJMFbwDqCZAiRXl0TncHtNAf+AFPMo/iWPUa7Lu7ioTvxYxslcPxyuC2uuwsiUvpw==; 31:jpmzS6xpqmqDZlbA0UFFm8A7IisuJeXfUNAJElOSOlhR6KL6wJGru/AYNy91Nb3YyoHa8rJk3Wn+aw87rQaPSTdPc+NE4+yZkjpFqfS+ZHfKqDB7RAyD1Ge0/0M4+xly3KyvvaG3RQqNinHdFGSsNS7HIuw9p1a2QBck93ocU5gm0V0Fi3uNQAj8zWVQ5RvMhdxfllvskgyXoAkMYA6MxnW3hgEpPU0meDC/qmfDyvw= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:z4CrAB/RDOCnznq+frHywL2068qwIsJqPgJLernEnjDWDcppWAIp4WRQUlgySVTO7i9UdG/F/SS7Ev6qwoMW7ELupfZr+H2Zk87GhXGwucEVKsxY1qx+hlL1RqJiR5lo04zZYi3Z0PiNmCJJe+jeC9nK4Ca02bj181T85TKiLVsvZS5GYhq2QkKRO132l4nbaFXH4DihKNdmFDnqyQDX6zM4xwscxy1MhduCPDdy2oAcwxs0nGEJm7QiB09ZjGr5C6Nm3mcws7Xp8P3G/icfBzVMpQgZQVWtYmjFzwwa9B575ZX4eIHs3i+syo5wI2sZ5RrjIts45xOzEUCg0K4nbPpD01s6ZeRyfd/Jp2tI+LqKLmME7w8nDe3tH63v5Zm/uvdqtcPasFFTMseQhJMMgkHS1hlZ/isVOc2kgGTehqI=; 4:bmnJ+hBXH83G9+xKaxH1u12m8mYrVLmjCA/M/qds+zuhxBoNgP8YZUeKLlBci8S1NX6+5TEl4Y0mirHYlgvL+AQ08a9BIYi0Stb4bpjwEYpYbN5FAPBCUL5lrVXaIo1Crt6Kv+vTug+PudHFskV/Ps40cVLyeq9+Yt34C1d6Q/0eFlMsmajz2JVcuvjS4swPOinDPO8wBkc4l+KdrU17bi3CtkTdWufEJoITHGFcnJYBD0cEAB3t4sxlhh0vbLSRRHoCnpOMU1yDYoz/NxQ3OQ== X-Microsoft-Antispam-PRVS: <HE1PR04MB1657A4A739FA9E6B554256A599620@HE1PR04MB1657.eurprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:HE1PR04MB1657; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1657; X-Forefront-PRVS: 0690E5FF22 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(396003)(366004)(346002)(39850400004)(39380400002)(189003)(199004)(6512007)(48376002)(105586002)(2616005)(16586007)(86362001)(6666003)(6916009)(478600001)(486006)(9686003)(25786009)(476003)(106356001)(11346002)(53416004)(316002)(6116002)(46003)(50226002)(36756003)(107886003)(2906002)(85782001)(446003)(16810700005)(53936002)(6486002)(305945005)(2361001)(81156014)(81166006)(69596002)(186003)(76176011)(52396003)(52116002)(2351001)(16526019)(51416003)(8936002)(4326008)(59450400001)(97736004)(33896004)(68736007)(6506007)(118296001)(8676002)(7736002)(50466002)(47776003)(5660300001)(386003)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1657; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR04MB1657; 23:Fsff+VWSKcyIr7o276+qPUJ3qwne7Ls1rzy8oN7co?= OuwvYh63b7Zvhjto2z8hjAGyqlDxvPa2Xfv6tSMI2exGDjYx2LhkA+w6tZ8+1WKeIY9gTUw14QSqJJUWzQfe0knMxmaaviS7Lzxtf/rPHqHgHiJ7M/AXe2higREjF+Aa9xJE1wTBS+xFT5tRWiSDlOZk+CDVPGWZ2ozLORlBW90Su/+OVnPW/9G28kbld+gXLS6VV3gTU3xZGsVpBMFfw9cjWiDzB6LP8tzvufMmcfzxd3M7gVRy6QeDvd5V0Mc7qaxJy9eej8tvaw2akrGLemYVsp5KIp1bGoi4nGhF9YnVmR0ihgPh9sC3OfGRZe4gWw2doxzSGLZtky6TvOtrIVpAGozX4oL19Ku7Zr2y6BZMrUjPe15xOwJH3P8wavDxJi1BfsFZbW/4r+2T9moXCY3EBQxkzoTkKPC0i+LWZfGdQkzhVq3nmtly3cVbXD0sxEWPxFiEmOAHVCfwEQxilXDYShuJHrZuu4z1LuQ/+fcn48nUXVhKjj/j1A4odHcAD9Ob3TeNA5Ph2guAYIDMjUnThxAu1e04VVoPLT+8F9vSkasCkv1JxOU4O6IgYNTFzaEKXZA01nMbektLGckbt1qgM7q+8KtZKRBxTvfPyalj0pQUDnFr5VmO4SeDZNtTOb9fKjHtM9TdPu6wgWTuqtDu81HfCGD78O6mxjI8XSxk+bZJmpmkFFKH5XlbblsiZMMuxHaYui3XzwJ3840wTmia6pFGstxgWz9K7CbLas05CrSFfKL7GeD+WximMxXcYGHzqPArkQyGBFPQb5bgOdTP7vbFWtI6ihFJegYODFrwxmpUk+n9imSe/ieLQJmEo+9beBHJUIfIazxcvcf4Svn2Z18jRVV4S7ivIW4VdJiniaT2x/L7DZKnvkBPPOGdmnS0iJ0oEYdAdiLI8aQrAbum3u+BPbYGHkPsvIk8/fdyCrLN9Z/n90FZqvQ8PNX54K7d/JGC2gblgKqCdHNOZEj2QSgwkxgSdlqbGruPaduIH+hR830Vmfd7jGCcGhANBAbLOK6C5Qb2s+7tBLpE34SuXIsA2QYyjioqNNxKQPz4OK982UbNQzoJqTThmuKS6hfhVnBHArl5HdL+Wf80R6vMU7rwF3fh+u0tuHk/WilMsMbPQoWKy4cIaXhJor9UtAocmzY7aUkpAcQSYNET5KPOOwRHVibHMFFJts/rHZoLH0Se9he0ogyP4BPGXHnyXtr9cU+ZvuqINgJ4ZzNPI9o3tMdhot0QAjOabsnZX5TCuelVCw0Imd+CzG+d3ynlx1uCOx3SvqgwdiQYR8Te7fedWBpq2O4UQDnKDhX7H0DHl6xfraoY/0XdFBUaqWcGnG3b1YW8e7zGm9XCP/c+tGx X-Microsoft-Antispam-Message-Info: JlCT3ctMrpjpRfAd+utljsP7rVGompiOwLYJ84l4/rx6NnMuf+I5Iv390KvdXHMAmTMtZ27xMVIIZxuJbGvnnwoR46SwE7nK6QLbfhsEaE8zEbwEq47Pq8qyNYOSm0NgVheTwLqBU/yxdhRUwHJieGTNVpLbvbLDbfGUBjv1gn+hngNZx8pyHg42KOlJiC8k X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:p6ixIiuMFtz7KYQfhxbLnVlzm5Sm78PMS/MDcSvJS3d4Rh/3aN1wu8p9hojKMNT4LUZPqMDWyV2q8POxpxErEGWJucX66kjKszL79exygaGVo4fUTHgrHiYkCKQ+VkPqe064eTUDp4TkWcANLIwF57Gg1i+VSXP87tZwyG042mIC7oWIWpkKGWaYhQ8kU9LFZrDB2aWlG75XR8Lo11yDfJdpqopqeyn7Y+iOZ0gKvx38slytECdhDfpKLSUy7bQWLvMQcU22vr4LHDstU/Cp1PAyMKsJaWMkf61GnAVOYav/PQL0OKWQegRnA/lbEQY0mysBu0JedEYjShEwmtNE9BGH6P4x0TZ+ZSf7Xd5Xgl/km5SgLoURHcEVcMKVX79kzIDwzyY+L4EFFkIGjhRaVmOawvo+5xX+PqokdIS2FifKRIiI7esd35vDFVuVk3cETQx0ZzTvfhAlFRJ/IneR0A==; 5:o3z9VikBtut+SwvbagdGZmLiR65K3Qyk0F3GdL7Df6NnjEeFQi6Ziw1hXgr5EtDSz1+TIIyL6RDatgviDJJQPK/w1YlTVajF2en3htuRnyM+kTdPjMf+aQfx6slzDptA+E3CIbpAkUYM5rpwflo93dPAoGHsqidicI+YNjiJqRI=; 24:P4esPFJ6svjo10YmI0DMxWmkgTIsRn9JLCqh8qgL2on/HVQCFfBu0SF70hc4PQjb8SuxbZsfdE3i+PX5XpRYNem6EAf3bdb+HY/whH2XPJo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:e0BnzZ1QMLkRLk88gzLt+Wdc1enXNbLkLSXnRPwfmoqpDlK1E4HYCSfCXNtbWT98qe3WXnkI9xpNG/iZ/JqMVWhqJqU3PSkveH5exANLlnN94U3SLVvas4gDRaHqO724G+rGBejtU0EgQmt14jNKX+XzMzIzfmoELvqETpnf+gLAeQnxbY2fo8U93zEFYXaqPWGK9xRWVZf6ZziISVhi/ncxLD5n/ih86t9pubgWeVYL8fPEY9LIARAb6pPVVvv6 X-MS-Office365-Filtering-Correlation-Id: 84163086-b82a-4705-36d2-08d5c75b5c80 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:34.3307 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 84163086-b82a-4705-36d2-08d5c75b5c80 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1657 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180531_180253_647604_E4911E8C X-CRM114-Status: UNSURE ( 7.70 ) 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.4.85 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: Peter Oh <peter.oh@bowerswilkins.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
mesh: enable DFS channels in mesh mode
|
expand
|
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 868bfc6..91bfe4b 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -257,6 +257,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;