Message ID | 20180920123306.14772-23-yuehaibing@huawei.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42GGl34xc3z9sCR for <patchwork-incoming-netdev@ozlabs.org>; Thu, 20 Sep 2018 22:49:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388433AbeITScc (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Thu, 20 Sep 2018 14:32:32 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:12649 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387920AbeITScb (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 20 Sep 2018 14:32:31 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 95D7487819F3B; Thu, 20 Sep 2018 20:49:06 +0800 (CST) Received: from localhost (10.177.31.96) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.399.0; Thu, 20 Sep 2018 20:48:59 +0800 From: YueHaibing <yuehaibing@huawei.com> To: <davem@davemloft.net>, <dmitry.tarnyagin@lockless.no>, <wg@grandegger.com>, <mkl@pengutronix.de>, <michal.simek@xilinx.com>, <hsweeten@visionengravers.com>, <madalin.bucur@nxp.com>, <pantelis.antoniou@gmail.com>, <claudiu.manoil@nxp.com>, <leoyang.li@nxp.com>, <linux@armlinux.org.uk>, <sammy@sammy.net>, <ralf@linux-mips.org>, <nico@fluxnic.net>, <steve.glendinning@shawell.net>, <f.fainelli@gmail.com>, <grygorii.strashko@ti.com>, <w-kwok2@ti.com>, <m-karicheri2@ti.com>, <t.sailer@alumni.ethz.ch>, <jreuter@yaina.de>, <kys@microsoft.com>, <haiyangz@microsoft.com>, <wei.liu2@citrix.com>, <paul.durrant@citrix.com>, <arvid.brodin@alten.se>, <pshelar@ovn.org> CC: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>, <linux-can@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linuxppc-dev@lists.ozlabs.org>, <linux-mips@linux-mips.org>, <linux-omap@vger.kernel.org>, <linux-hams@vger.kernel.org>, <devel@linuxdriverproject.org>, <linux-usb@vger.kernel.org>, <xen-devel@lists.xenproject.org>, <dev@openvswitch.org>, YueHaibing <yuehaibing@huawei.com> Subject: [PATCH net-next 22/22] net: hsr: fix return type of ndo_start_xmit function Date: Thu, 20 Sep 2018 20:33:06 +0800 Message-ID: <20180920123306.14772-23-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20180920123306.14772-1-yuehaibing@huawei.com> References: <20180920123306.14772-1-yuehaibing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.31.96] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
net: fix return type of ndo_start_xmit function
|
expand
|
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index b8cd43c..a067150 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -233,7 +233,7 @@ static netdev_features_t hsr_fix_features(struct net_device *dev, } -static int hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev) { struct hsr_priv *hsr = netdev_priv(dev); struct hsr_port *master;
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t. Found by coccinelle. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- net/hsr/hsr_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)