Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 35141534938e76b545de943a7397c60ad23ebff7..35f76f2f7824b8c2756e60bb5249fd4f5502cc8d 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -706,11 +706,11 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,
        if (batadv_tt_local_client_is_roaming(bat_priv, ethhdr->h_dest, vid)) {
                if (batadv_reroute_unicast_packet(bat_priv, unicast_packet,
                                                  ethhdr->h_dest, vid))
-                       net_ratelimited_function(batadv_dbg, BATADV_DBG_TT,
-                                                bat_priv,
-                                                "Rerouting unicast packet to %pM (dst=%pM): Local Roaming\n",
-                                                unicast_packet->dest,
-                                                ethhdr->h_dest);
+                       batadv_dbg_ratelimited(BATADV_DBG_TT,
+                                              bat_priv,
+                                              "Rerouting unicast packet to %pM (dst=%pM): Local Roaming\n",
+                                              unicast_packet->dest,
+                                              ethhdr->h_dest);
                /* at this point the mesh destination should have been
                 * substituted with the originator address found in the global
                 * table. If not, let the packet go untouched anyway because
@@ -752,10 +752,10 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,
         */
        if (batadv_reroute_unicast_packet(bat_priv, unicast_packet,
                                          ethhdr->h_dest, vid)) {
-               net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv,
-                                        "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n",
-                                        unicast_packet->dest, ethhdr->h_dest,
-                                        old_ttvn, curr_ttvn);
+               batadv_dbg_ratelimited(BATADV_DBG_TT, bat_priv,
+                                      "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n",
+                                      unicast_packet->dest, ethhdr->h_dest,
+                                      old_ttvn, curr_ttvn);
                return 1;
        }