From patchwork Fri Apr 27 19:26: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: 10369775 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A6A2E601BE for ; Fri, 27 Apr 2018 19:26:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9651A2949A for ; Fri, 27 Apr 2018 19:26:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AA3D2949C; Fri, 27 Apr 2018 19:26:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6FAD2949A for ; Fri, 27 Apr 2018 19:26:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758884AbeD0T0y (ORCPT ); Fri, 27 Apr 2018 15:26:54 -0400 Received: from mail-eopbgr00065.outbound.protection.outlook.com ([40.107.0.65]:39264 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758865AbeD0T0x (ORCPT ); Fri, 27 Apr 2018 15:26:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=YRnpuuSKUp/0jkSPOJwGjMhGY7fzpDEY2gDLayW5Sd4=; b=BvLCDuwgOonpgP8lXPkCzRIvWxBnPBQ3NOF2795nSBIPzUJLsEgbKBaDp2LGEX51VY8ozil3tEcMtTgLQFmBTa1esWADULpOUewZR5YHm6btzp5N6+Ktqwg+dRsnXs1rOpvZemLLnZCphuO8QOG4a4r6qoYUdWoYh8mdIiFMP/c= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:716c:d40a:d21c:aea4) by DB5PR04MB1656.eurprd04.prod.outlook.com (2a01:111:e400:5995::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.15; Fri, 27 Apr 2018 19:26:49 +0000 From: peter.oh@bowerswilkins.com To: linux-wireless@vger.kernel.org, johannes@sipsolutions.net Cc: Peter Oh , johannes.berg@intel.com Subject: [PATCH] mesh: don't process mesh channel switch unless csa ie provided Date: Fri, 27 Apr 2018 12:26:36 -0700 Message-Id: <1524857196-29399-1-git-send-email-peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:716c:d40a:d21c:aea4] X-ClientProxiedBy: CO2PR04CA0080.namprd04.prod.outlook.com (2603:10b6:102:1::48) To DB5PR04MB1656.eurprd04.prod.outlook.com (2a01:111:e400:5995::14) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1656; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1656; 3:V2/jxpsB2J7MuttLkBISPlA9I0X86ZqWdA2KZ+zyPOl6KhtpFzm7j+KzVWgMeReQEvw4Wb4U/54RetxYFbl9aNx1INfUlTsnexqgBYTBr2cOnGnu3sWmHTX1LTtlZt3njIL9E0XsK9AJb7Zv/vvrqkstuequqCbOxa05vi7hzuhYzy63BcosF30IYzhS+SpK7HpaENVYw3y7DiIEDmSbVHHjX04xJPfmj5yeVbZF1gADv8t795jznmOZhpzIZ6uT; 25:75z9kgjJyTUnPjXNgSQpy5S8ZVPpVoI+USTr2iPqL0wgr5XXHSnyS4kpcbWkp7+E3+UusujmM7Rk5EwrUxVWL3QisS3RzrhCfHRYOccMXX25OxywV9PbSfT89EJ+YTBcUYN3VF49xu4eeXpqlpmjdOR9NZ9/b8OAmmYwBI1UPdU7ypJfzBfuaQPVW/VlzhterKRFDSYNxyYTadyBjHyPu2aVztIK3AXycmlV/BDg58cYwn5opniyb3YSF3AwNjMum22C+xhrba1HKKHyL8PTMSYX7kO6VxqSpiLQduINqOHm8KazvmV61TM4tTyzmynOk7rt5+rnAr41We37H/DkeQ==; 31:ua6WMgQK/OPsBrh/xb3pemZk/XycWQPq9efWdnUjg97Ow78zP9UvKMWUdjmdpd5ucNL19rKmIU8a8IlzAiuTtovgD67vdUzE3kWc+FSdEvEC1HE5LpmDs2nwWcUnGgbre4LEGbFuC4rEi4DpFjGNjnmNggM1gpGREfuneuNWaOSH1zqvclrpTQ7qk82jc2ilTFXGT5Zr3pIKdkzbgFV2DZUlsWy6cWz5OHvpWQikCEI= X-MS-TrafficTypeDiagnostic: DB5PR04MB1656: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1656; 20:WfxgmzU0lS741frY30jO4c3GtcQn8gBS365VBmVW6ngAFAhTphNYn/qANRamefwOKaADKjHOcfH4yNt+aWlyNXeopw3RQ1jqwhDdtTfirkJGp7n3y/X5YBBQJoR4bQI8TMQupgSCfBEMbPzX3++0S54BAZf+nz2uNFIfSlod3/har8RbDTRjHx93RVTD5qzBsapclSoJb5p0j3CZP2zdJeF5bigV1K/1mYsccZ3NybKEvx6mHELfvSDfWNHLdJhEAPEvQ9GfBVwN+TmEJdj5uUfDU2BxGEDnoIyZ2eqb+9pvj1nY7GZuFZk2a4U0bs7CAud+TJslX10UMsp569VbCQ==; 4:msNZGCPPCYFJPHzLA6fmL6H34R8KvPpmiNXX79uEYxjXs6ZWOgjExAzBAlL1eAdO5K3GKpfq1iLbfKBzR9uZXcZPsREWygLg3ioDIZ1mlPwel0J+Tg5sFLTh/xHfIikc6hwz963FKdwf0QcMZ00+Jqpx/87bPoLXHgA7RjqROPG5R+9AsO2NWZUQv5qCOuB/FXtTsZBkgEX85FH6x5reNWioJD+EJud3iShCLIclHciu+BMhYw/DpwAsxOHdxWJRQmVPkDiU1JNt/xYRXGcZOQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231232)(944501410)(52105095)(10201501046)(93006095)(93001095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DB5PR04MB1656; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1656; X-Forefront-PRVS: 0655F9F006 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39380400002)(376002)(366004)(396003)(39850400004)(189003)(199004)(2616005)(36756003)(86362001)(105586002)(16526019)(106356001)(486006)(46003)(52396003)(1857600001)(85782001)(476003)(186003)(6486002)(386003)(6506007)(48376002)(52116002)(16586007)(51416003)(59450400001)(53416004)(33896004)(50466002)(69596002)(4326008)(6116002)(9686003)(50226002)(8936002)(81166006)(81156014)(6666003)(316002)(47776003)(68736007)(7736002)(6512007)(305945005)(478600001)(16810700005)(2906002)(53936002)(8676002)(97736004)(5660300001)(25786009)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1656; 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; DB5PR04MB1656; 23:0xS36Hm8dCu/Z0sDVp1ccb24AEnQmpdi9Qkz4FtK9?= =?us-ascii?Q?F+yi0PM3F41rxoxSOJOV+6xgOnrc9nYHBfuNAbkZBJhacD7AP/rnxyVB+Oq9?= =?us-ascii?Q?XQP6RR+3H/4EFcoucS6fFz30KFMAt8FlmaLnOScf3O0bWTudDd9nv2jP6u5u?= =?us-ascii?Q?YeD9wBawhhtOAvkObEE4kfY6zj1gGSKwNdpcjo93/cQJSFMwNkSdXaXQiZrm?= =?us-ascii?Q?TqIl+Nnmzu9EIscTI9ouOSUhY6vtrif/ASI0jgBUbQXVWCUmnsV+PZfQPiRG?= =?us-ascii?Q?v9n+ZHeScvA0PCV2YaljTmvW+B8TQtUIj+S+W+9NqKju53InDR7CqqeLJgrJ?= =?us-ascii?Q?cDMQud2VRpci3FGy6xR3q7sTj1BGL/VIDq3p/3BrybBGlPbnifINWJSvn/L4?= =?us-ascii?Q?rekrRm7GK6BuELlgBva4JZDS/CsqbVhmV4G47Q1LKoEW+pbGpSxQyQ+lc8MK?= =?us-ascii?Q?WvsSJ/D+saifPuLX02u0pTRWo5FLF2Ax2YJGhgEfKCw8dj2hdbAknwUxmgvw?= =?us-ascii?Q?m804qB1e/wSikSPsP5vDbJqRnX9N27VOCmXMPwBPYnt/DeQSwDcWH4OAfeKz?= =?us-ascii?Q?HiVn0uNk7hHM556iCyNBvC2b35mbGYYzYUDJ0UfzSp1fv+D7NxlkCgHzqVHu?= =?us-ascii?Q?2SqA8x6a7a2LJGKk6uMZNAlpV0X5undp3DP2gigpYaux3FCj707HyOQCRGlp?= =?us-ascii?Q?q4O0hmPFgS5LDbXfpGyvRqyK0b1xXTw2mJnSALP/qPnZFEOj4z31rusKUrof?= =?us-ascii?Q?Fol/rO/2wPt4aeuUlBYJBST0qTBSUApp+ZbWjmiR0iKXb/MK6Se3vBjx3hKv?= =?us-ascii?Q?gXWhflvEWPmL37IAAikWlvsyAK+Q7xD1ypBri2EeWi/yxOU6mWMXmnnBW3OV?= =?us-ascii?Q?L7ihAkghBmPGpDBDRG+C+D/gXdpHn3ClYRfWr3rzl+pzuOsrptnR/pB4C0S/?= =?us-ascii?Q?HONwMAciQlIUAKClGmTvECf38p5SMdLnH0H/keLWaVSFdXyH8y/7za8eIVP6?= =?us-ascii?Q?bkHFYh8b+qJ/UydhtQ0U2yGDZkBUcXIoDZvvmQ/Xk6Sx4mq8yVL34xtWUa2d?= =?us-ascii?Q?yAmetjxBcdDZzosEL3ZC5JcdgQS3isIlcq7iEb2iAJKt5JO+uVoQs3Py3tqV?= =?us-ascii?Q?VKhB7s6w6YhyqE47jT6BEYDTpKKEFEIcuTTqBtVQKORf9vcFrg8VlxlvLD6U?= =?us-ascii?Q?e6kS7QYYRDvfpo39A65hJKMawfYxaz9lSXKZ2+tj5s7dLQniyFo5H6PJEN//?= =?us-ascii?Q?4tO2djkyIE1lxy/6rpVOedAhsrZf9UZocXKH7Of?= X-Microsoft-Antispam-Message-Info: j5h6amSWO2cixpRCQyQuYcCsZaxF74snqtt4tutoIT5dSWH+zAHczQJprMNlniYAfDE3IACyYbvFcQLu+ZktaCeCDVDN/XtJyTuSx2yXT+lYioztlTOTUsFDSeiTQUB0Iwd/j+jvn86EXxOvZQkbCPS+cD/YuWzy5mfcnSb8yexKlwbUUAyjf/R9lNPScfHR X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1656; 6:eVbG2xgRI0ypgsw5sn8UwDkYL4K9K+/tjDQSeFA/L6xdji04/ln6gGvOFu+Yv1rOEZ7jbAS9zGidIJMJxnJiK0SLlbUl1oaRiCDDc+R80Cg76D4vTenpC2cjNocwzzWsCwQX26ndjQcMC7LbbGLi3ZjXw5AaJYHmDN6J1eRIYi90PTK46SgqJVofxFn8iVOkEYdNw2rpW8S1RZi40A/aS7gpHKbUTnBSIG9PRRaIN6ssSfFFudzjqq7bu9I1klEjKW77QqtKLKVp3cOGtjDBOfQZQjpRS45k5a1s/pza3L8C3Wz6PDJG+PQ5O025riSQg2QxA27SGBnkGxIBaSarLfkQ1UVCvtoNm0CpzKPIdqEL2GwIgXVb99RqhqALaGj0N9M1HLkufo/GGCmamcaiQuhwmyvLp40LSG66+4lyvu4E88klouysKSp/JjzW/3zzJtTLVypXDJOdqrVWB2yJhA==; 5:Xg745GSYY8mWSMBRUwAkbVS5eQpYxoDAwhYs1/9kVXZRdHHsH3WN1/wKF3Vb0LmShXhAr/q14dzgVx905oNBJmxbV9sUaH+5l3xmO2Xu3iwz4NFiQ70nQmNfPBgpDkLkELyOoqUHx9mimVsX3LBWI+oNg4biJJ5G293T4Ldrpl8=; 24:LjKfxDUtJFoUgfEhNZDCnH8Zd/qflAYfOHk7j33X2lnwhJY00JxcKDxHcujMswMDJs5C3dE8jq1hoiMCJugqRDpAjPJMXB7o18dgHGC/Dps= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1656; 7:H0WQXmk5n61vp/0/ZCxtfgiapQ8p7omfNmIDNpBBzoSGo6ubQgsqKpHocgSj+gMBDcWs6KLNlkEf+s0KgioywRKjb6MEwnaEG/VL52VRXCe+D+pf7iXHd/vcClW7HzJFUW1i3OOfGcz5tMWSp96v/mVxT9LsLkH/EUigKzL85Q8EHN2hNb8AaLiuYiRTk5LM1CKF78+PIBwHpG4w9nQ64C0BjsY0tYdS0m4X49xWy6AFzvPMyqE+gTsHVeBVOh1X X-MS-Office365-Filtering-Correlation-Id: b20d06ea-7b3f-45c8-c699-08d5ac74d330 X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2018 19:26:49.2478 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b20d06ea-7b3f-45c8-c699-08d5ac74d330 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1656 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Peter Oh There is no meaning to call ieee80211_mesh_process_chnswitch without CSA IE provided, since the function will always return error. Signed-off-by: Peter Oh --- net/mac80211/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index d51da26e9c18..8ced757dff8d 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -1196,7 +1196,7 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, stype, mgmt, &elems, rx_status); if (ifmsh->csa_role != IEEE80211_MESH_CSA_ROLE_INIT && - !sdata->vif.csa_active) + !sdata->vif.csa_active && elems.ch_switch_ie) ieee80211_mesh_process_chnswitch(sdata, &elems, true); }