diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-10 04:51:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-16 00:42:15 -0700 |
| commit | 2d6c9ffcca7808f42ba6b953da0ba60e19a9cbbd (patch) | |
| tree | c2406d2059ae2a554a26ee0d67c4aa45d02e2635 /net | |
| parent | a465419b1febb603821f924805529cff89cafeed (diff) | |
| download | op-kernel-dev-2d6c9ffcca7808f42ba6b953da0ba60e19a9cbbd.zip op-kernel-dev-2d6c9ffcca7808f42ba6b953da0ba60e19a9cbbd.tar.gz | |
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: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/8021q/vlan_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b5249c5..55be908 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -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 |
