RE: [PATCH net-next 17/22] hv_netvsc: fix return type of ndo_start_xmit function
From: Haiyang Zhang <haiyangz@microsoft.com>
Date: 2018-09-20 14:40:29
Also in:
linux-arm-kernel, linux-can, linux-hams, linux-mips, linux-omap, linux-usb, lkml, netdev
-----Original Message----- From: YueHaibing <redacted> Sent: Thursday, September 20, 2018 8:33 AM 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; KY Srinivasan <kys@microsoft.c=
om>;
Haiyang Zhang [off-list ref]; 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.o=
rg;
linux-hams@vger.kernel.org; devel@linuxdriverproject.org; linux- usb@vger.kernel.org; xen-devel@lists.xenproject.org; dev@openvswitch.org; YueHaibing [off-list ref] Subject: [PATCH net-next 17/22] hv_netvsc: fix return type of ndo_start_x=
mit
function =20 The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', whi=
ch is
a typedef for an enum type, so make sure the implementation in this drive=
r has
returns 'netdev_tx_t' value, and change the function return type to netde=
v_tx_t.
quoted hunk ↗ jump to hunk
=20 Found by coccinelle. =20 Signed-off-by: YueHaibing <redacted> --- drivers/net/hyperv/netvsc_drv.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) =20diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_=
drv.c
quoted hunk ↗ jump to hunk
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, str=
uct
net_device *vf_netdev, return rc; } =20 -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 =3D netdev_priv(net);
struct hv_netvsc_packet *packet =3D NULL; @@ -528,8 +529,11 @@
static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
*/
vf_netdev =3D 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 =3D 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=20 error can go away after retrying, returning NETDEV_TX_BUSY may cause=20 infinite retry from the upper layer. Thanks, - Haiyang