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

Commit 2d6c9ffc authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: congestion notifications are not dropped packets 



vlan/macvlan start_xmit() can inform caller of congestion with
NET_XMIT_CN return value. This doesnt mean packet was dropped.
Increment normal stat counters instead of tx_dropped.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a465419b

drivers/net/macvlan.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ netdev_tx_t macvlan_start_xmit(struct sk_buff *skb, 
	int ret;



	ret = macvlan_queue_xmit(skb, dev);

	if (likely(ret == NET_XMIT_SUCCESS)) {

	if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {

		txq->tx_packets++;

		txq->tx_bytes += len;

	} else

net/8021q/vlan_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, 
	len = skb->len;

	ret = dev_queue_xmit(skb);



	if (likely(ret == NET_XMIT_SUCCESS)) {

	if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {

		txq->tx_packets++;

		txq->tx_bytes += len;

	} else
@@ -353,7 +353,7 @@ static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, 
	len = skb->len;

	ret = dev_queue_xmit(skb);



	if (likely(ret == NET_XMIT_SUCCESS)) {

	if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {

		txq->tx_packets++;

		txq->tx_bytes += len;

	} else