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

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

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 0f8742b4bfaa461a5ce94125a610a3307578b99b..cb2d1b9b034058c454fa0b7c5c14e6491ed41b1d 100644 (file)
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -478,7 +478,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,
                batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX);
                batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES,
                                   skb->len + ETH_HLEN);
-               batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr);
+               batadv_send_broadcast_skb(skb, hard_iface);
        }
 }
 
@@ -1026,7 +1026,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,
                neigh_ifinfo->bat_iv.tq_avg = tq_avg;
                spin_unlock_bh(&tmp_neigh_node->ifinfo_lock);
 
-               batadv_neigh_ifinfo_free_ref(neigh_ifinfo);
+               batadv_neigh_ifinfo_put(neigh_ifinfo);
                neigh_ifinfo = NULL;
        }
 
@@ -1120,9 +1120,9 @@ out:
        if (router)
                batadv_neigh_node_put(router);
        if (neigh_ifinfo)
-               batadv_neigh_ifinfo_free_ref(neigh_ifinfo);
+               batadv_neigh_ifinfo_put(neigh_ifinfo);
        if (router_ifinfo)
-               batadv_neigh_ifinfo_free_ref(router_ifinfo);
+               batadv_neigh_ifinfo_put(router_ifinfo);
 }
 
 /**
@@ -1192,7 +1192,7 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
        neigh_ifinfo = batadv_neigh_ifinfo_new(neigh_node, if_outgoing);
        if (neigh_ifinfo) {
                neigh_rq_count = neigh_ifinfo->bat_iv.real_packet_count;
-               batadv_neigh_ifinfo_free_ref(neigh_ifinfo);
+               batadv_neigh_ifinfo_put(neigh_ifinfo);
        } else {
                neigh_rq_count = 0;
        }
@@ -1353,7 +1353,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
                packet_count = bitmap_weight(bitmap,
                                             BATADV_TQ_LOCAL_WINDOW_SIZE);
                neigh_ifinfo->bat_iv.real_packet_count = packet_count;
-               batadv_neigh_ifinfo_free_ref(neigh_ifinfo);
+               batadv_neigh_ifinfo_put(neigh_ifinfo);
        }
        rcu_read_unlock();
 
@@ -1368,7 +1368,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
 out:
        spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock);
        batadv_orig_node_put(orig_node);
-       batadv_orig_ifinfo_free_ref(orig_ifinfo);
+       batadv_orig_ifinfo_put(orig_ifinfo);
        return ret;
 }
 
@@ -1514,7 +1514,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
                                          ogm_packet, if_incoming,
                                          if_outgoing, dup_status);
        }
-       batadv_orig_ifinfo_free_ref(orig_ifinfo);
+       batadv_orig_ifinfo_put(orig_ifinfo);
 
        /* only forward for specific interface, not for the default one. */
        if (if_outgoing == BATADV_IF_DEFAULT)
@@ -1566,7 +1566,7 @@ out_neigh:
                batadv_orig_node_put(orig_neigh_node);
 out:
        if (router_ifinfo)
-               batadv_neigh_ifinfo_free_ref(router_ifinfo);
+               batadv_neigh_ifinfo_put(router_ifinfo);
        if (router)
                batadv_neigh_node_put(router);
        if (router_router)
@@ -1574,7 +1574,7 @@ out:
        if (orig_neigh_router)
                batadv_neigh_node_put(orig_neigh_router);
        if (hardif_neigh)
-               batadv_hardif_neigh_free_ref(hardif_neigh);
+               batadv_hardif_neigh_put(hardif_neigh);
 
        kfree_skb(skb_priv);
 }
@@ -1805,7 +1805,7 @@ batadv_iv_ogm_orig_print_neigh(struct batadv_orig_node *orig_node,
                           neigh_node->addr,
                           n_ifinfo->bat_iv.tq_avg);
 
-               batadv_neigh_ifinfo_free_ref(n_ifinfo);
+               batadv_neigh_ifinfo_put(n_ifinfo);
        }
 }
 
@@ -1870,7 +1870,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv,
 next:
                        batadv_neigh_node_put(neigh_node);
                        if (n_ifinfo)
-                               batadv_neigh_ifinfo_free_ref(n_ifinfo);
+                               batadv_neigh_ifinfo_put(n_ifinfo);
                }
                rcu_read_unlock();
        }
@@ -1964,9 +1964,9 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1,
 
 out:
        if (neigh1_ifinfo)
-               batadv_neigh_ifinfo_free_ref(neigh1_ifinfo);
+               batadv_neigh_ifinfo_put(neigh1_ifinfo);
        if (neigh2_ifinfo)
-               batadv_neigh_ifinfo_free_ref(neigh2_ifinfo);
+               batadv_neigh_ifinfo_put(neigh2_ifinfo);
 
        return diff;
 }
@@ -2007,9 +2007,9 @@ batadv_iv_ogm_neigh_is_sob(struct batadv_neigh_node *neigh1,
 
 out:
        if (neigh1_ifinfo)
-               batadv_neigh_ifinfo_free_ref(neigh1_ifinfo);
+               batadv_neigh_ifinfo_put(neigh1_ifinfo);
        if (neigh2_ifinfo)
-               batadv_neigh_ifinfo_free_ref(neigh2_ifinfo);
+               batadv_neigh_ifinfo_put(neigh2_ifinfo);
 
        return ret;
 }