Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23b4b1a0 authored by Liang Chen's avatar Liang Chen Committed by Greg Kroah-Hartman
Browse files

veth: Fixing transmit return status for dropped packets 



[ Upstream commit 151e887d8ff97e2e42110ffa1fb1e6a2128fb364 ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0133bc28

drivers/net/veth.c

+3 −1
Original line number Diff line number Diff line
@@ -238,6 +238,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_rq *rq = NULL;

	int ret = NETDEV_TX_OK;

	struct net_device *rcv;

	int length = skb->len;

	bool rcv_xdp = false;
@@ -270,6 +271,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) 
	} else {

drop:

		atomic64_inc(&priv->dropped);

		ret = NET_XMIT_DROP;

	}



	if (rcv_xdp)
@@ -277,7 +279,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) 


	rcu_read_unlock();



	return NETDEV_TX_OK;

	return ret;

}



static u64 veth_stats_tx(struct pcpu_lstats *result, struct net_device *dev)