> -----Original Message----- > From: YueHaibing <yuehaib...@huawei.com> > Sent: Thursday, September 20, 2018 8:33 AM > To: da...@davemloft.net; dmitry.tarnya...@lockless.no; > w...@grandegger.com; m...@pengutronix.de; michal.si...@xilinx.com; > hswee...@visionengravers.com; madalin.bu...@nxp.com; > pantelis.anton...@gmail.com; claudiu.man...@nxp.com; leoyang...@nxp.com; > li...@armlinux.org.uk; sa...@sammy.net; r...@linux-mips.org; > n...@fluxnic.net; steve.glendinn...@shawell.net; f.faine...@gmail.com; > grygorii.stras...@ti.com; w-kw...@ti.com; m-kariche...@ti.com; > t.sai...@alumni.ethz.ch; jreu...@yaina.de; KY Srinivasan <k...@microsoft.com>; > Haiyang Zhang <haiya...@microsoft.com>; wei.l...@citrix.com; > paul.durr...@citrix.com; arvid.bro...@alten.se; pshe...@ovn.org > Cc: linux-ker...@vger.kernel.org; net...@vger.kernel.org; linux- > c...@vger.kernel.org; linux-arm-ker...@lists.infradead.org; linuxppc- > d...@lists.ozlabs.org; linux-m...@linux-mips.org; linux-o...@vger.kernel.org; > linux-h...@vger.kernel.org; de...@linuxdriverproject.org; linux- > u...@vger.kernel.org; xen-devel@lists.xenproject.org; d...@openvswitch.org; > YueHaibing <yuehaib...@huawei.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 <yuehaib...@huawei.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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel