diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-10 06:51:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-16 09:42:15 +0200 |
| commit | 2d6c9ffcca7808f42ba6b953da0ba60e19a9cbbd (patch) | |
| tree | c2406d2059ae2a554a26ee0d67c4aa45d02e2635 /drivers | |
| parent | net: Introduce sk_route_nocaps (diff) | |
| download | linux-2d6c9ffcca7808f42ba6b953da0ba60e19a9cbbd.tar.xz linux-2d6c9ffcca7808f42ba6b953da0ba60e19a9cbbd.zip | |
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 'drivers')
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 1b78c0057a8d..4e238afab4a3 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -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 |