From patchwork Mon Oct 1 08:57:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 977060 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="dVi0Mgtl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Nx590sywz9s3x for ; Mon, 1 Oct 2018 18:58:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728998AbeJAPep (ORCPT ); Mon, 1 Oct 2018 11:34:45 -0400 Received: from mail-eopbgr10057.outbound.protection.outlook.com ([40.107.1.57]:38080 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728849AbeJAPeo (ORCPT ); Mon, 1 Oct 2018 11:34:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rex6zvExw65e9c4duZ9ARwco52TlrnJmP6ufO22ueNo=; b=dVi0MgtlA209d8Ma3MR7VnFe15rwQPCHO1HxUb4+0r5ZXjfydhw0aGNYjS4mvqBIJi+XIqtQNRNU3t+2UivWGeyt/pPrG3myDFQwsv5he860jaxjeaLqZOc/1GoygT+i+xRDiR528YdcOEsXNl8hPHMmjQB4YhN1+pjFWdrdhVw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from splinter.mtl.com (79.179.106.3) by AM6PR05MB4981.eurprd05.prod.outlook.com (2603:10a6:20b:10::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.20; Mon, 1 Oct 2018 08:57:54 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, nikolay@cumulusnetworks.com, roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, mlxsw@mellanox.com, Ido Schimmel Subject: [PATCH net-next] bridge: mcast: Default back to multicast enabled state Date: Mon, 1 Oct 2018 11:57:01 +0300 Message-Id: <20181001085701.23295-1-idosch@mellanox.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [79.179.106.3] X-ClientProxiedBy: AM5PR0602CA0022.eurprd06.prod.outlook.com (2603:10a6:203:a3::32) To AM6PR05MB4981.eurprd05.prod.outlook.com (2603:10a6:20b:10::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3172be74-f019-4092-1cc1-08d6277bfa31 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4981; X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4981; 3:RN5F7UR4viQOhEyiIfwCCdc0MB9+TzjRROuncmjmXeNKKppyfgrOXVg11zmRw50EYNnqs+QC8VXG5RULJMRHlSnA2NyA7y4Js466oaXWLC4MtGOITuzRlXaJETqOuNpW8eP1lL2PUWH/lbuIfmzu6ThMb6YbJXya7Ocrpr/2EnKrrUMglRmu1bEPHKeSWWxw1e1AWj/QldbiVGuxXzy59PMs+PWd2vNaucNXmI34nT9YJ/+a5OjKBwL+NwxZAT2j; 25:iTvAqdP2XFSfQ+NRLpavTd7dRVth/cAWFG6txYDOOaoigxTu2WxeKxKSv3lzvH+kVucCC1o8MeNRJxKHoq1dLuU//yXMz35DDm8dBu8OJaToyZgFADCMoyeVXjIeRBgtGBlEuBjte+eTkv4b6Fzk/U5fkXM3gSwqSIG10vaOCN4dfwOsIfUw/FGnqLe6sJugTIc4ECaUnLN8mRv5RCBYjhcmZ3RBV7rSUusAy60h4jpb4lB3njYmCZ9ojfHw6dOC8fYdIxXtMvHIvEI7z47OIwO0CjnCnYBPyA9O81CaHs7FX5yuhVqzGSSI/e7f8wrT+ijViCrcK0hy+b62FRIyCA==; 31:r2S5Vjzu4+M8fvrddBznER8hREHBjHN3jc57a6mPvFPD2yusUhQyOYIawDPEsb9IoEBUqjKyshjavnwqRDFYcLxIIZG4P4tjz8TQ+rmzCe8+/bKru0UJgdi/hN6gvRsh1GO61KiLeAhoVhCQ2sTWFUJTSmN4QyvteKZrnpfFHIUM/wqNiQguoJ8fsa9dCBRypvD++PfzJVSrtWchEbTvB4A0qQXqbSA11DAXp2d89ZA= X-MS-TrafficTypeDiagnostic: AM6PR05MB4981: X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4981; 20:QepM9QYp9VnlfMRcEwFxR0i8TFeureOHF+cTpQfp+qjrtgylZwXjY+PBeH5cwCF8Y1UT/o5YT7yInmk0mOnf889JyfoGqxNjyJT+KjTHYCiByh1MGgE9dJy3Y6gaMEaZ754ON30AQbXVT6FTH2gmtDWtS1YCDQSzs1FRJr4Uwr2OLf/XYtn2h8fGgY94TBoC7bj0BIyDkt7Zf4fVd8A8Rf3SJ+9PZiRGonHLMyweygs14oWsDjAIxfWcjYS50iW3dEu8fBwdR1Zv+RBKGutacJH3R1l02I4ieaDgN5MJWIzegpSsE7VnbvqdiSPL1aW2y6OO8FXmMrbKnfhtXnPXPqCce/taGY6Z5HK7WJVcZEBEOTyxkuOmfReIYS7bmkWp9c8+9XyGZ4roeFC+0JBi5+OUFlKBSDMyTqcIKq+OLTXAHtvf2kI7M79xDEC7lqyAAmIqxXnEdkgitwLsQjAxErCP1bfbXb+eIlySX5sGuOX/o9doSoEMqA8XOOvqCLXc; 4:pnA63v5UKDqXWbk5f7sFSsTAKuUg9mYOm8ic8v9sj7vlG10Ufkdqur1Tzs3x5X+kY5UYKx9ctuE+3Pq3+apXMujU0WHGLfhqKDsUmXIHCAhaNTgb2HhS7ycJD0z9boWZmLfgJ9RTr6UrpHP7quk63K/ao2Bxg++W6ufYSXnW42lfFeweuHpzNzgqUyoxit4ncXVIAOE0jNzotfKX69Yer/Xd5/m2Z51cvALv0u2NhOyvE8yOqUaTDXFeL2qp/t7ThiYm1sZFwuQO9IgkDijKXQ== 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)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150057)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(201708071742011)(7699051); SRVR:AM6PR05MB4981; BCL:0; PCL:0; RULEID:; SRVR:AM6PR05MB4981; X-Forefront-PRVS: 0812095267 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(366004)(346002)(376002)(136003)(39860400002)(396003)(199004)(189003)(476003)(2616005)(97736004)(66066001)(26005)(16586007)(4326008)(3846002)(6116002)(6486002)(6666003)(6512007)(5660300001)(53936002)(186003)(16526019)(6916009)(486006)(86362001)(34290500001)(47776003)(956004)(4006002)(50226002)(1076002)(51416003)(25786009)(52116002)(2906002)(36756003)(50466002)(48376002)(14444005)(53416004)(7736002)(305945005)(316002)(386003)(68736007)(6506007)(2361001)(8676002)(81156014)(81166006)(8936002)(106356001)(478600001)(107886003)(2351001)(105586002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4981; H:splinter.mtl.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4981; 23:4qOT4XdMk2rdPY+1ttrDq6rMI3RXJ2zkVzpI7XKlk/KxFToR5LCRIz4fY2BqcaS+Mt0Tlwek4VcWiuCqy0agMy4u0+b2rCBPcsvGQYbav7tsQAvKV1qG5G7MaOsl54O0YT2vePvrsZMtABhQzrhGOWeIwFwUe8QglpVq1T5+i+RtaBgsjRcPLUvgPWsXORpEY6iMDZ2oQ2CBt/7+eyUfbQsn1a1cutBp4E6bJRdA50IJeGW6Mt1Pg/T6VyfIkdEUIzsQdE1n9M3anGo8MvRzqt9vQAYyTmfgPcJKRZp6+1oJFD2MDs2v7xZXm0oLfQhAQ7ni/Os47r2F/eMM3KBTixqxrs7t+M1kFOXtEURq4BgJ368pDqwl5Wvoc6b4zRVgpGDhUb57nW9CPjWWdu0pVCNIeMDYy4WaiFA5uDf94nUvGeTiXP+X4VIYQ80OCzU/+j0r2weJ8Th6MlCiypzyhh1Ra49N7eFmLBWKBGC6hImJ+KNZ6HJFBmmzDidYKacb7N1pjuOtHz/DbXasJYPgh3DprHNyDkOPY9Pa9F4QK/Gt6/9+VTHbcpYjrp5QCBMQrAYbHvnP0N/oNXl2ZSUbWnm8b6fyxFeH6rWG676m6PMBV2rRqgF08A8cg+8V9OFGmQY4cafojfVVCXcUYagDc3OjtnUsk0BrkDQsRgz+bM5Oo1tSQm1pzUi4T5qDG4MGdE2gFLAMb7p1fxWJFQ9IIyIyO2bX6VnSce6NktvcUtFK37lMlKiPGkhy7EbJue15agMQdZ2hnKhepDudvMssJcVj9C9h7yOoaVD0ffB0iW+OpaCh00WJthEWUxorXnYYJN3tBdHCVqZXazFKKZkzKkb+DVMQEjzMEwo7Sf8TGoMU+tTslOUwI+dX6WS3ULw0LsNFoE53rDcz27mP75jjvt65jKSgluQdHa78tA68KkayEIy+A+N9Nx6HSgk6YAhELQ0Cz/xvOMsVaXDQJ06SpcM4hDJReygmIcA96JP4RwNZrQCOeje/ql3ECqP2YktAmykIUoYkkyxmOlgiEbuyiy0fNhmW4on/lyJHrwEAgpARSRFF3ZtGMRvmXzCeR4wxQKANnMUR2c50I8lBvAJo5wK/SQK2hkrsfT7xi1XZNEQ14oeRVnLV90zubiQMlbpydx0aYqSYxeMBv27Mug6s7y5SsClBOAWhJxbIYqBhBr8+8WM36FXtIfaoKfZQ6N7qJJbVI6EArGrMXei8D/k0EuKazf2Qf5TR96DGcBOCcEsyMe4H+kF1xJBFwY2P7kAaTCz3RsuSUoo9S0B4+EYwE1u0roJAVNHOOQsbr6l+IQ4fiLfkkrV2icrVLjs1dgkO7nPjNkCHgkPrQms0wYs9zIKDt5DhnzoJ54I3/6fJT84= X-Microsoft-Antispam-Message-Info: nmvXdLpkXjNYF80F2C9fpGOr7FAdMpEFkS+WruYdyywJMoMvcYTQprhoR5LTn115GPURDJ94Daua7Mv/B7yze5q0Gd/eym+ABYrNQsmkMOGxhsCHQQPEzVwOVe6mMUtdJqQ6wyqa3tv97W2kohBsVueQW6mVwlzTNkl/OPj6+vvw1oWvvP+cz8/l6hbHWBoXpTsX5Pp+QKk8xpe0W3i4p0Q0s+0wpkPRFg61/KiuqquyeygTM0uTrqRazROYq+IX7S9MK4TT9wZY0rgTKnoKUi4+s4uHOrIBC67C4v8xTdOjL025SYm1S9wa8Vcx3NugOGgdi0o4qLz7mV1Syf0fIctDN3PVIjdD/KTBGxJAdbs= X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4981; 6:8x6rB6FBzMViUSTA6yJZhIRJOMFJ6UHu8845hEtYrCTpHI/svkd6KkMbtP/pgKtVAIB19ElS6bMUvyykWPYGbBi3JRA+eiUPGo/0RLm0TTb9Tl9JKTrDjc9RDxPj90QEHf6dXNHNwmC5nH9e0fztp1M72JC4fxDnwiVGlkV6bYVKblIlMuxgvtUQ9e7yTReyccr5+RRMOjJZWQUT/8Ptaivyf1xjWIpF3kqdstHHrhjJAGVkIKE3K1qrieOuv1HMk4otx12yIMmNf41+wzSy76EcoeBCHPvsxDzKjpQSUaXeGybiF6QnvVYAct8GJQxC8tR1G2K/SfmWCuDq0aTIedDdCbeFa43pUx3XMSGkoajWUZLYP64by7tGBHsV0HgbhHqDWM0ivFbiCJOrWvYeqG07AlYZSRBnLzm7yisMGJJjbwTTuu+fgSHHbJOsdNp4Kkxf7zvk8xWRiQvv6BYQfA==; 5:vhrAf02PTqcDQTPjcoQ/NS6lSQcPohTclEX85uYfV9k2EAi4zww8vd5tgaUurtsw5Z5HSNDtekVg5yFiSmAKPeafOkCgCEYUvx4Qp1/k5Jo+sNIC/G76TxU2o5ZgtDMSOPfL3IUmqF2lieXtcU0yurblYetMU9/Edy5riXxk7ek=; 7:UGW0GgQx0K0ekmGeszbnNanMrGgE+YEtq36eCol1kQrECNKM+vp4QihHAUCXpWjuMQ2OuJDmLhNE0Qe94o795HWQr8nJAAKrtXsyX9Apjqil1YQJhO7vX9nP9/vPlFhyBCfEk8NbOl0WWyZYv2KNLSv4q5bB6D4SM7t1jnFh4JTU1gJoqPYcejtGmkrvKOkQjjw/xvK0efeCeYjrFcOSDq1C20o2MvBhLDfQvA/c1himXnOH9cOPFVVLDG/TlfXV SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2018 08:57:54.5080 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3172be74-f019-4092-1cc1-08d6277bfa31 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4981 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 13cefad2f2c1 ("net: bridge: convert and rename mcast disabled") converted the 'multicast_disabled' field to an option bit named 'BROPT_MULTICAST_ENABLED'. While the old field was implicitly initialized to 0, the new field is not initialized, resulting in the bridge defaulting to multicast disabled state and breaking existing applications. Fix this by explicitly initializing the option. Fixes: 13cefad2f2c1 ("net: bridge: convert and rename mcast disabled") Signed-off-by: Ido Schimmel Acked-by: Nikolay Aleksandrov --- net/bridge/br_multicast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 928024d8360d..024139b51d3a 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1976,6 +1976,7 @@ void br_multicast_init(struct net_bridge *br) br->ip6_other_query.delay_time = 0; br->ip6_querier.port = NULL; #endif + br_opt_toggle(br, BROPT_MULTICAST_ENABLED, true); br_opt_toggle(br, BROPT_HAS_IPV6_ADDR, true); spin_lock_init(&br->multicast_lock);