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

[deliverable/linux.git] / net / batman-adv / distributed-arp-table.c

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 8f466e782bc7afba1741df461af6b0ee5e1deb3a..e96d7c745b4a1de6444284f38207ed599925ac2e 100644 (file)
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -77,11 +77,11 @@ static void batadv_dat_entry_release(struct kref *ref)
 }
 
 /**
- * batadv_dat_entry_free_ref - decrement the dat_entry refcounter and possibly
+ * batadv_dat_entry_put - decrement the dat_entry refcounter and possibly
  *  release it
  * @dat_entry: dat_entry to be free'd
  */
-static void batadv_dat_entry_free_ref(struct batadv_dat_entry *dat_entry)
+static void batadv_dat_entry_put(struct batadv_dat_entry *dat_entry)
 {
        kref_put(&dat_entry->refcount, batadv_dat_entry_release);
 }
@@ -135,7 +135,7 @@ static void __batadv_dat_purge(struct batadv_priv *bat_priv,
                                continue;
 
                        hlist_del_rcu(&dat_entry->hash_entry);
-                       batadv_dat_entry_free_ref(dat_entry);
+                       batadv_dat_entry_put(dat_entry);
                }
                spin_unlock_bh(list_lock);
        }
@@ -349,7 +349,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip,
 
        if (unlikely(hash_added != 0)) {
                /* remove the reference for the hash */
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
                goto out;
        }
 
@@ -358,7 +358,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip,
 
 out:
        if (dat_entry)
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
 }
 
 #ifdef CONFIG_BATMAN_ADV_DEBUG
@@ -654,9 +654,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv,
                        goto free_neigh;
                }
 
-               send_status = batadv_send_skb_packet(tmp_skb,
-                                                    neigh_node->if_incoming,
-                                                    neigh_node->addr);
+               send_status = batadv_send_unicast_skb(tmp_skb, neigh_node);
                if (send_status == NET_XMIT_SUCCESS) {
                        /* count the sent packet */
                        switch (packet_subtype) {
@@ -674,7 +672,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv,
                        ret = true;
                }
 free_neigh:
-               batadv_neigh_node_free_ref(neigh_node);
+               batadv_neigh_node_put(neigh_node);
 free_orig:
                batadv_orig_node_put(cand[i].orig_node);
        }
@@ -840,7 +838,7 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset)
 
 out:
        if (primary_if)
-               batadv_hardif_free_ref(primary_if);
+               batadv_hardif_put(primary_if);
        return 0;
 }
 
@@ -1029,7 +1027,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
        }
 out:
        if (dat_entry)
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
        return ret;
 }
 
@@ -1109,7 +1107,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
        }
 out:
        if (dat_entry)
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
        if (ret)
                kfree_skb(skb);
        return ret;
@@ -1262,6 +1260,6 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,
 
 out:
        if (dat_entry)
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
        return ret;
 }