The following commit has been merged in the master branch: commit c33705188c493b7de3b8dc2956d67de91b444727 Author: Gao Feng <gfree.wind(a)gmail.com> Date: Mon Nov 21 23:00:32 2016 +0800 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(a)gmail.com> [sven(a)narfation.org: Moved NET_XMIT_CN handling to batadv_send_skb_packet] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index d730826..d9b2889 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; -- LinuxNextTracking