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

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

diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index bcabb5e3f4d3a2c3478999b3deb80b1a7595500b..14d0013b387ed4cfbf797884857414ae8bf0e7f7 100644 (file)
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2016  B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -278,7 +278,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff,
 
        ether_addr_copy(icmp_header->orig, primary_if->net_dev->dev_addr);
 
-       batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+       batadv_send_unicast_skb(skb, neigh_node);
        goto out;
 
 dst_unreach:
@@ -288,11 +288,11 @@ free_skb:
        kfree_skb(skb);
 out:
        if (primary_if)
-               batadv_hardif_free_ref(primary_if);
+               batadv_hardif_put(primary_if);
        if (neigh_node)
-               batadv_neigh_node_free_ref(neigh_node);
+               batadv_neigh_node_put(neigh_node);
        if (orig_node)
-               batadv_orig_node_free_ref(orig_node);
+               batadv_orig_node_put(orig_node);
        return len;
 }