[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <BN6PR21MB016115A6ACD7D2685DC0070DCA130@BN6PR21MB0161.namprd21.prod.outlook.com>
Date: Thu, 20 Sep 2018 14:40:20 +0000
From: Haiyang Zhang <haiyangz@...rosoft.com>
To: YueHaibing <yuehaibing@...wei.com>,
"davem@...emloft.net" <davem@...emloft.net>,
"dmitry.tarnyagin@...kless.no" <dmitry.tarnyagin@...kless.no>,
"wg@...ndegger.com" <wg@...ndegger.com>,
"mkl@...gutronix.de" <mkl@...gutronix.de>,
"michal.simek@...inx.com" <michal.simek@...inx.com>,
"hsweeten@...ionengravers.com" <hsweeten@...ionengravers.com>,
"madalin.bucur@....com" <madalin.bucur@....com>,
"pantelis.antoniou@...il.com" <pantelis.antoniou@...il.com>,
"claudiu.manoil@....com" <claudiu.manoil@....com>,
"leoyang.li@....com" <leoyang.li@....com>,
"linux@...linux.org.uk" <linux@...linux.org.uk>,
"sammy@...my.net" <sammy@...my.net>,
"ralf@...ux-mips.org" <ralf@...ux-mips.org>,
"nico@...xnic.net" <nico@...xnic.net>,
"steve.glendinning@...well.net" <steve.glendinning@...well.net>,
"f.fainelli@...il.com" <f.fainelli@...il.com>,
"grygorii.strashko@...com" <grygorii.strashko@...com>,
"w-kwok2@...com" <w-kwok2@...com>,
"m-karicheri2@...com" <m-karicheri2@...com>,
"t.sailer@...mni.ethz.ch" <t.sailer@...mni.ethz.ch>,
"jreuter@...na.de" <jreuter@...na.de>,
KY Srinivasan <kys@...rosoft.com>,
"wei.liu2@...rix.com" <wei.liu2@...rix.com>,
"paul.durrant@...rix.com" <paul.durrant@...rix.com>,
"arvid.brodin@...en.se" <arvid.brodin@...en.se>,
"pshelar@....org" <pshelar@....org>
CC: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"linux-can@...r.kernel.org" <linux-can@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linuxppc-dev@...ts.ozlabs.org" <linuxppc-dev@...ts.ozlabs.org>,
"linux-mips@...ux-mips.org" <linux-mips@...ux-mips.org>,
"linux-omap@...r.kernel.org" <linux-omap@...r.kernel.org>,
"linux-hams@...r.kernel.org" <linux-hams@...r.kernel.org>,
"devel@...uxdriverproject.org" <devel@...uxdriverproject.org>,
"linux-usb@...r.kernel.org" <linux-usb@...r.kernel.org>,
"xen-devel@...ts.xenproject.org" <xen-devel@...ts.xenproject.org>,
"dev@...nvswitch.org" <dev@...nvswitch.org>
Subject: RE: [PATCH net-next 17/22] hv_netvsc: fix return type of
ndo_start_xmit function
> -----Original Message-----
> From: YueHaibing <yuehaibing@...wei.com>
> Sent: Thursday, September 20, 2018 8:33 AM
> To: davem@...emloft.net; dmitry.tarnyagin@...kless.no;
> wg@...ndegger.com; mkl@...gutronix.de; michal.simek@...inx.com;
> hsweeten@...ionengravers.com; madalin.bucur@....com;
> pantelis.antoniou@...il.com; claudiu.manoil@....com; leoyang.li@....com;
> linux@...linux.org.uk; sammy@...my.net; ralf@...ux-mips.org;
> nico@...xnic.net; steve.glendinning@...well.net; f.fainelli@...il.com;
> grygorii.strashko@...com; w-kwok2@...com; m-karicheri2@...com;
> t.sailer@...mni.ethz.ch; jreuter@...na.de; KY Srinivasan <kys@...rosoft.com>;
> Haiyang Zhang <haiyangz@...rosoft.com>; wei.liu2@...rix.com;
> paul.durrant@...rix.com; arvid.brodin@...en.se; pshelar@....org
> Cc: linux-kernel@...r.kernel.org; netdev@...r.kernel.org; linux-
> can@...r.kernel.org; linux-arm-kernel@...ts.infradead.org; linuxppc-
> dev@...ts.ozlabs.org; linux-mips@...ux-mips.org; linux-omap@...r.kernel.org;
> linux-hams@...r.kernel.org; devel@...uxdriverproject.org; linux-
> usb@...r.kernel.org; xen-devel@...ts.xenproject.org; dev@...nvswitch.org;
> YueHaibing <yuehaibing@...wei.com>
> Subject: [PATCH net-next 17/22] hv_netvsc: fix return type of ndo_start_xmit
> function
>
> 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@...wei.com>
> ---
> drivers/net/hyperv/netvsc_drv.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
> index 3af6d8d..056c472 100644
> --- a/drivers/net/hyperv/netvsc_drv.c
> +++ b/drivers/net/hyperv/netvsc_drv.c
> @@ -511,7 +511,8 @@ static int netvsc_vf_xmit(struct net_device *net, struct
> net_device *vf_netdev,
> return rc;
> }
>
> -static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
> +static netdev_tx_t
> +netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
> {
> struct net_device_context *net_device_ctx = netdev_priv(net);
> struct hv_netvsc_packet *packet = NULL; @@ -528,8 +529,11 @@
> static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
> */
> vf_netdev = rcu_dereference_bh(net_device_ctx->vf_netdev);
> if (vf_netdev && netif_running(vf_netdev) &&
> - !netpoll_tx_running(net))
> - return netvsc_vf_xmit(net, vf_netdev, skb);
> + !netpoll_tx_running(net)) {
> + ret = netvsc_vf_xmit(net, vf_netdev, skb);
> + if (ret)
> + return NETDEV_TX_BUSY;
For error case, please just return NETDEV_TX_OK. We are not sure if the
error can go away after retrying, returning NETDEV_TX_BUSY may cause
infinite retry from the upper layer.
Thanks,
- Haiyang
Powered by blists - more mailing lists