Commit 151e887d authored by Liang Chen's avatar Liang Chen Committed by David S. Miller

veth: Fixing transmit return status for dropped packets

The veth_xmit function returns NETDEV_TX_OK even when packets are dropped.
This behavior leads to incorrect calculations of statistics counts, as
well as things like txq->trans_start updates.

Fixes: e314dbdc ("[NET]: Virtual ethernet device driver.")
Signed-off-by: default avatarLiang Chen <liangchen.linux@gmail.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 817c7cd2
...@@ -344,6 +344,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -344,6 +344,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct veth_priv *rcv_priv, *priv = netdev_priv(dev); struct veth_priv *rcv_priv, *priv = netdev_priv(dev);
struct veth_rq *rq = NULL; struct veth_rq *rq = NULL;
int ret = NETDEV_TX_OK;
struct net_device *rcv; struct net_device *rcv;
int length = skb->len; int length = skb->len;
bool use_napi = false; bool use_napi = false;
...@@ -378,11 +379,12 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -378,11 +379,12 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
} else { } else {
drop: drop:
atomic64_inc(&priv->dropped); atomic64_inc(&priv->dropped);
ret = NET_XMIT_DROP;
} }
rcu_read_unlock(); rcu_read_unlock();
return NETDEV_TX_OK; return ret;
} }
static u64 veth_stats_tx(struct net_device *dev, u64 *packets, u64 *bytes) static u64 veth_stats_tx(struct net_device *dev, u64 *packets, u64 *bytes)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment