summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGao Feng <gfree.wind@gmail.com>2016-11-21 16:00:32 +0100
committerSimon Wunderlich <sw@simonwunderlich.de>2017-01-26 08:41:18 +0100
commitc33705188c493b7de3b8dc2956d67de91b444727 (patch)
treef6875227138a7585b73baa427b527242322d88f5
parentbatman-adv: Remove one condition check in batadv_route_unicast_packet (diff)
downloadlinux-c33705188c493b7de3b8dc2956d67de91b444727.tar.xz
linux-c33705188c493b7de3b8dc2956d67de91b444727.zip
batman-adv: Treat NET_XMIT_CN as transmit successfully
The tc could return NET_XMIT_CN as one congestion notification, but it does not mean the packet is lost. Other modules like ipvlan, macvlan, and others treat NET_XMIT_CN as success too. So batman-adv should handle NET_XMIT_CN also as NET_XMIT_SUCCESS. Signed-off-by: Gao Feng <gfree.wind@gmail.com> [sven@narfation.org: Moved NET_XMIT_CN handling to batadv_send_skb_packet] Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
-rw-r--r--net/batman-adv/send.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index d7308263b8fa..d9b2889064a6 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -115,7 +115,7 @@ int batadv_send_skb_packet(struct sk_buff *skb,
* congestion and traffic shaping, it drops and returns NET_XMIT_DROP
* (which is > 0). This will not be treated as an error.
*/
- return dev_queue_xmit(skb);
+ return net_xmit_eval(dev_queue_xmit(skb));
send_skb_err:
kfree_skb(skb);
return NET_XMIT_DROP;