From patchwork Mon Nov 21 15:03:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?6auY5bOw?= X-Patchwork-Id: 16864 Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 4C1AA831F8; Mon, 21 Nov 2016 16:07:53 +0100 (CET) Authentication-Results: open-mesh.org; dmarc=none header.from=ikuai8.com Received-SPF: Pass (sender SPF authorized) identity=helo; client-ip=119.147.194.222; helo=smtpbg179.qq.com; envelope-from=fgao@ikuai8.com; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=none header.from=ikuai8.com X-Greylist: delayed 404 seconds by postgrey-1.35 at open-mesh.org; Mon, 21 Nov 2016 16:07:47 CET Received: from smtpbg179.qq.com (SMTPBG179.QQ.COM [119.147.194.222]) by open-mesh.org (Postfix) with ESMTPS id 4CCC38076C for ; Mon, 21 Nov 2016 16:07:45 +0100 (CET) X-QQ-mid: bizesmtp8t1479740643tka5qe7vv Received: from ikuai-dev.ikuai8.com (unknown [123.56.230.35]) by esmtp4.qq.com (ESMTP) with id ; Mon, 21 Nov 2016 23:03:57 +0800 (CST) X-QQ-SSF: 01400000004000F0FH40000C0000000 X-QQ-FEAT: wbEa/wNpOMx191ogpptuEJrZppMxdMKIay1inHj2424wLGSX4QR50jyrFB6+b a9JjY0ClJnoLI3wSEvfKV7IwiPAK1OEgxqZlD6DFHZULqWSqpvaC1j0ygH08dYnI4SZBc25 oA0UczaWYxnA6m6O+jxJLa5QX2j8tIqjJl7qwkaGQr3j1W1pTJFwdLZ6F1e521PB4GFxFm/ uMu0GFiKWP32dWRwjNW68Ws1j3FyoZ6DAQEWYbSX/JhimuPIdNVk2DXGOtXqBHCr+v+vBJV Y4UySl7AM6PwnS X-QQ-GoodBg: 2 From: fgao@ikuai8.com To: mareklindner@neomailbox.ch, sw@simonwunderlich.de, a@unstable.cc, davem@davemloft.net, b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org, gfree.wind@gmail.com Date: Mon, 21 Nov 2016 23:03:56 +0800 Message-Id: <1479740636-3904-1-git-send-email-fgao@ikuai8.com> X-Mailer: git-send-email 1.9.1 X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [B.A.T.M.A.N.] [PATCH net-next 1/2] net: batman-adv: Treat NET_XMIT_CN as transmit successfully X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" From: Gao Feng 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 add the NET_XMIT_CN check. Signed-off-by: Gao Feng --- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/routing.c | 10 +++++----- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/tp_meter.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 49576c5..f6ff4de 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -659,7 +659,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, } send_status = batadv_send_unicast_skb(tmp_skb, neigh_node); - if (send_status == NET_XMIT_SUCCESS) { + if (send_status == NET_XMIT_SUCCESS || send_status == NET_XMIT_CN) { /* count the sent packet */ switch (packet_subtype) { case BATADV_P_DAT_DHT_GET: diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 9c561e6..5239616 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -509,7 +509,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES, skb_fragment->len + ETH_HLEN); ret = batadv_send_unicast_skb(skb_fragment, neigh_node); - if (ret != NET_XMIT_SUCCESS) { + if (ret != NET_XMIT_SUCCESS && ret != NET_XMIT_CN) { ret = NET_XMIT_DROP; goto free_skb; } diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 6713bdf..6b08b26 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -262,7 +262,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, icmph->ttl = BATADV_TTL; res = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (res == NET_XMIT_SUCCESS) + if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) ret = NET_RX_SUCCESS; /* skb was consumed */ @@ -330,7 +330,7 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet->ttl = BATADV_TTL; res = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (res == NET_RX_SUCCESS) + if (res == NET_RX_SUCCESS || res == NET_XMIT_CN) ret = NET_XMIT_SUCCESS; /* skb was consumed */ @@ -424,7 +424,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, /* route it */ res = batadv_send_skb_to_orig(skb, orig_node, recv_if); - if (res == NET_XMIT_SUCCESS) + if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) ret = NET_RX_SUCCESS; /* skb was consumed */ @@ -719,14 +719,14 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, len = skb->len; res = batadv_send_skb_to_orig(skb, orig_node, recv_if); - if (res == NET_XMIT_SUCCESS) + if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) ret = NET_RX_SUCCESS; /* skb was consumed */ skb = NULL; /* translate transmit result into receive result */ - if (res == NET_XMIT_SUCCESS) { + if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) { /* skb was transmitted and consumed */ batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 7b3494a..60516bb 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -386,7 +386,7 @@ static int batadv_interface_tx(struct sk_buff *skb, ret = batadv_send_skb_via_tt(bat_priv, skb, dst_hint, vid); } - if (ret != NET_XMIT_SUCCESS) + if (ret != NET_XMIT_SUCCESS && ret != NET_XMIT_CN) goto dropped_freed; } diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index f156452..44bfb1e 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -615,7 +615,7 @@ static int batadv_tp_send_msg(struct batadv_tp_vars *tp_vars, const u8 *src, batadv_tp_fill_prerandom(tp_vars, data, data_len); r = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (r == NET_XMIT_SUCCESS) + if (r == NET_XMIT_SUCCESS || r == NET_XMIT_CN) return 0; return BATADV_TP_REASON_CANT_SEND;