Hi Sergei,

On Mon, Nov 21, 2016 at 6:44 PM, Sergei Shtylyov
[off-list ref] wrote:

Hello.

On 11/21/2016 3:39 AM, fgao@ikuai8.com wrote:

quoted

From: Gao Feng <redacted>

The tc could return NET_XMIT_CN as one congestion notification, but
it does not mean the packe is lost. Other modules like ipvlan,

   Packet.

Thanks, it was typo.

quoted

macvlan, and others treat NET_XMIT_CN as success too.

So batman-adv should add the NET_XMIT_CN check.

Signed-off-by: Gao Feng <redacted>

[...]

quoted

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 7e8dc64..8edd324 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c

@@ -706,7 +706,7 @@ static int batadv_route_unicast_packet(struct sk_buff

*skb,
                goto out;

        /* translate transmit result into receive result */
-       if (res == NET_XMIT_SUCCESS) {
+       if (res == NET_XMIT_SUCCESS || ret == NET_XMIT_CN) {

Thanks again.
I didn't find it during myself's review and compile process.

   Not 'res == NET_XMIT_CN'?

quoted

                /* skb was transmitted and consumed */
                batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);
                batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,

[...]

MBR, Sergei

I have sent the v2 patch which corrects these two typos.

Best Regards
Feng