Received: by 10.213.65.68 with SMTP id h4csp1855893imn; Mon, 19 Mar 2018 15:21:33 -0700 (PDT) X-Google-Smtp-Source: AG47ELtbRAK736CAwePbtgWekMFiFYaNwV+EXUHscpP2rOmNT8rpZNiiAXB0Nk08pwQeljVuHFUS X-Received: by 10.99.6.198 with SMTP id 189mr10484876pgg.131.1521498093060; Mon, 19 Mar 2018 15:21:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521498093; cv=none; d=google.com; s=arc-20160816; b=KHQIypotPl4tWQOJl/DCv5uTUemUwj9WhvGpTYqNVKGKZ7dYB0MrRitHPIx7BwIHAB KriXRDqx8nHFMy/C6BaD40svSJIlfzrxvH/Fk3OQ3FYqfLTmk3AfxRETBAFlzXJGVdLB 102DMIZ9b5KqABoovmBbNFUUFFw18yLb40yVpOg0891zf2WfLCahr+TiDaWkL8gZxEUP Ejc9AnGqnZtKno9+f107MX+77Fs4YEFP/UNZQYmBsHC4WAnqtOue9kYfx4KK0H7Eth98 VtLpNOyNFo3fdH+Y6WG3ZgAGTWqg89+0efbrYLXfLldHrJ10lHkdUzVb1Ru2l67kyyk5 AWzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=FNgn8eg4BImQMrSB4IMNLROAgR+ZSwMwZ3sF4bo2OSc=; b=BVxTII5qYQSw1C5ZzvNIFcdIa0ZFNHaWc1shHvpCL89m+VMQREdG/NAYMlvAbRzayL 4AvvVZVmImNDKt4as7+IuMC9X2yJU+eI6NkOu9EzxQ8UHIYBGmxXhx5UwmXBIB8B5OL4 XKQZs+Bf5Qnfr6RIRPOkq3DVNdAnsXaF3CV2aezPJoGvljbWWRmWx8zNIlkmaUXHdWhY cqhGQq6uKhfMGWNexj7wNE5JD75sRkYt9/BAcDXQehOlHE0x9wOBdCaXHLirPo2KaQmy L78oegD99QE7NVFpRskhiOZ+cnemsXAkxJ9LOOlcvY5KKs5ux3oqAxFy/oOIKqjA3M6a BlJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=lYNva37u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l26si167022pfg.303.2018.03.19.15.21.18; Mon, 19 Mar 2018 15:21:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=lYNva37u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936417AbeCSWTx (ORCPT + 99 others); Mon, 19 Mar 2018 18:19:53 -0400 Received: from mail-cys01nam02on0111.outbound.protection.outlook.com ([104.47.37.111]:18692 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933956AbeCSPtZ (ORCPT ); Mon, 19 Mar 2018 11:49:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=FNgn8eg4BImQMrSB4IMNLROAgR+ZSwMwZ3sF4bo2OSc=; b=lYNva37uLi0eR4cRQomyBTyIuaEMBmMJo1ejO1/9jnu7ZOH1j8+GtbngCyKuq4noUuPgvNdzq2Wj2AoeUNGctv2dtuHDgJOsOO/DSWNQTB0liog5JPMy2nZumUS+Sjx3cIQ6Us12qU9wHx+PoCLxBgdTGkkihilrAtBsoO/Yzmk= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0919.namprd21.prod.outlook.com (52.132.132.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 15:49:04 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 15:49:03 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Gal Pressman , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.15 086/124] net: Fix netdev_WARN_ONCE macro Thread-Topic: [PATCH AUTOSEL for 4.15 086/124] net: Fix netdev_WARN_ONCE macro Thread-Index: AQHTv5m9Fdgt7tTcx0aJP4QlSXhrWw== Date: Mon, 19 Mar 2018 15:48:35 +0000 Message-ID: <20180319154645.11350-86-alexander.levin@microsoft.com> References: <20180319154645.11350-1-alexander.levin@microsoft.com> In-Reply-To: <20180319154645.11350-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0919;7:2SvRIlhhwRtrHnOke9MDifpRlaAtmBFh7TYLeWc2FxB8j18vZvz0mq5LOfS3Qlm2hO8QXyLP1sjTG5EvmE24VuHjHwJ6AKrHPrzm1hlSl6p8quKeNnd/tOZ+ZbwSU5Zyt6tMe27qbKu1LMO+hrhgVE+175wXoQC1SiQ/DOLKQ9uWUhOZaH4/rGgeoB9pIhC10ohzwOWF1bt/n/FsbwC4gypoquffPSJaa+JdlTB0seU+waCmkT+OYwUnR44dxfnn;20:e2y+8MjPyGnkDRtrfEKXfNPjhFtQZQQGEX9bQne9mgKITKvCqS9+RZkW8Uk+cj6OQc4oKtp3VHIfJ2nNhPwtt1CnhCXMvCPX+bkWQbdLIabVFCi/9IeDy7TvHmmATtYU9ZlgPuOISsdnAsDJzGP/00Oqa/S5BHnHsSCyg7RiKu0= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 242011a2-afe5-4e23-5a28-08d58db0f0fe x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0919; x-ms-traffictypediagnostic: DM5PR2101MB0919: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB0919;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0919; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(366004)(39860400002)(396003)(39380400002)(346002)(199004)(189003)(6512007)(5250100002)(106356001)(99286004)(102836004)(2501003)(6116002)(1076002)(3846002)(186003)(10090500001)(76176011)(6486002)(25786009)(316002)(26005)(22452003)(68736007)(6436002)(2900100001)(54906003)(2950100002)(6666003)(72206003)(81156014)(3660700001)(4326008)(7736002)(110136005)(305945005)(478600001)(3280700002)(6506007)(97736004)(81166006)(8676002)(10290500003)(575784001)(66066001)(2906002)(86362001)(105586002)(8936002)(53936002)(36756003)(14454004)(86612001)(5660300001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0919;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: OEZT+lEjDCJlwqa9M9tW25U2CRFyIBcFcIV+eH33ThZt+cFXGng0yLGacevRtaWg1qRFX3/otixE1HKZN6Bver/hQAsstOhIXvHBBvF7mahqk3SaoFfFzu3uIM0Pcau0e1lo/Q45PrC7F0yInHCj1IhOM1LfkoWovw1N20MNXKYrzw6RwhEcNP/BpLZAllT0U3Oq3aCOlohHUDqaEJvkVN9cvxN7SR2704HhnJFlp5hYvuhBj0wzuNv0kh7mAEioVimplgovD3FWra+TrVLsdQRDJcIsSaobb0cEcK8tVipFd2tADKcdYbfxn73BUd7M0d1j0oU6yppv2xJ+rsUBcA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 242011a2-afe5-4e23-5a28-08d58db0f0fe X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 15:48:35.2203 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0919 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gal Pressman [ Upstream commit 72dd831e24cc9487a9cd534fdd675fe97e3c1839 ] netdev_WARN_ONCE is broken (whoops..), this fix will remove the unnecessary "condition" parameter, add the missing comma and change "arg" to "args". Fixes: 375ef2b1f0d0 ("net: Introduce netdev_*_once functions") Signed-off-by: Gal Pressman Reviewed-by: Saeed Mahameed Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/linux/netdevice.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ef789e1d679e..ddb1fc7bd938 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4402,8 +4402,8 @@ do { \ WARN(1, "netdevice: %s%s\n" format, netdev_name(dev), \ netdev_reg_state(dev), ##args) =20 -#define netdev_WARN_ONCE(dev, condition, format, arg...) \ - WARN_ONCE(1, "netdevice: %s%s\n" format, netdev_name(dev) \ +#define netdev_WARN_ONCE(dev, format, args...) \ + WARN_ONCE(1, "netdevice: %s%s\n" format, netdev_name(dev), \ netdev_reg_state(dev), ##args) =20 /* netif printk helpers, similar to netdev_printk */ --=20 2.14.1