summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2018-09-26 17:15:38 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-24 08:19:17 +0100
commitc234566f1ea088d82a1bb997f075848bc5a1c2de (patch)
treebf90ec882f1db859deaf2c8def3d2b7c8fa06ac6
parentd51d9605888d6a9fddec1676dda734a9737e65d6 (diff)
downloadlinux-stable-c234566f1ea088d82a1bb997f075848bc5a1c2de.tar.gz
linux-stable-c234566f1ea088d82a1bb997f075848bc5a1c2de.tar.bz2
linux-stable-c234566f1ea088d82a1bb997f075848bc5a1c2de.zip
net: ovs: fix return type of ndo_start_xmit function
[ Upstream commit eddf11e18dff0e8671e06ce54e64cfc843303ab9 ] 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> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--net/openvswitch/vport-internal_dev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index d2356a284646..3ebf8ba7c389 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -43,7 +43,8 @@ static struct internal_dev *internal_dev_priv(struct net_device *netdev)
}
/* Called with rcu_read_lock_bh. */
-static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t
+internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
{
int len, err;
@@ -62,7 +63,7 @@ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
} else {
netdev->stats.tx_errors++;
}
- return 0;
+ return NETDEV_TX_OK;
}
static int internal_dev_open(struct net_device *netdev)