Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / net / batman-adv / fragmentation.c

diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index d13c5b601b67ebd7fb00691ec2c878c9b60bac6e..e6956d0746a20f91c51d256c231ddfe4f2626c26 100644 (file)
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -378,8 +378,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,
                                   skb->len + ETH_HLEN);
 
                packet->ttl--;
-               batadv_send_skb_packet(skb, neigh_node->if_incoming,
-                                      neigh_node->addr);
+               batadv_send_unicast_skb(skb, neigh_node);
                ret = true;
        }
 
@@ -387,7 +386,7 @@ out:
        if (orig_node_dst)
                batadv_orig_node_put(orig_node_dst);
        if (neigh_node)
-               batadv_neigh_node_free_ref(neigh_node);
+               batadv_neigh_node_put(neigh_node);
        return ret;
 }
 
@@ -486,8 +485,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
                batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX);
                batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES,
                                   skb_fragment->len + ETH_HLEN);
-               batadv_send_skb_packet(skb_fragment, neigh_node->if_incoming,
-                                      neigh_node->addr);
+               batadv_send_unicast_skb(skb_fragment, neigh_node);
                frag_header.no++;
 
                /* The initial check in this function should cover this case */
@@ -506,7 +504,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
        batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX);
        batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES,
                           skb->len + ETH_HLEN);
-       batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+       batadv_send_unicast_skb(skb, neigh_node);
 
        ret = true;