Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
commit 3882bab2cb2c5d4555107a763c1cbe937370986c Merge: c11379b 205dc83 Author: Sven Eckelmann sven@narfation.org Date: Tue Jan 17 09:00:18 2017 +0100
Merge branch 'maint'
3882bab2cb2c5d4555107a763c1cbe937370986c net/batman-adv/fragmentation.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --cc net/batman-adv/fragmentation.c index 92e411d,0854ebd..eb85153 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@@ -509,9 -509,9 +509,9 @@@ int batadv_frag_send_packet(struct sk_b 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; + goto put_primary_if; }
frag_header.no++;