diff options
Diffstat (limited to 'net/batman-adv/routing.c')
-rw-r--r-- | net/batman-adv/routing.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 8e43a951694f..b8c47dcb5853 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c | |||
@@ -72,20 +72,20 @@ static void _batadv_update_route(struct bat_priv *bat_priv, | |||
72 | 72 | ||
73 | /* route deleted */ | 73 | /* route deleted */ |
74 | if ((curr_router) && (!neigh_node)) { | 74 | if ((curr_router) && (!neigh_node)) { |
75 | batadv_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n", | 75 | batadv_dbg(BATADV_DBG_ROUTES, bat_priv, |
76 | orig_node->orig); | 76 | "Deleting route towards: %pM\n", orig_node->orig); |
77 | batadv_tt_global_del_orig(bat_priv, orig_node, | 77 | batadv_tt_global_del_orig(bat_priv, orig_node, |
78 | "Deleted route towards originator"); | 78 | "Deleted route towards originator"); |
79 | 79 | ||
80 | /* route added */ | 80 | /* route added */ |
81 | } else if ((!curr_router) && (neigh_node)) { | 81 | } else if ((!curr_router) && (neigh_node)) { |
82 | 82 | ||
83 | batadv_dbg(DBG_ROUTES, bat_priv, | 83 | batadv_dbg(BATADV_DBG_ROUTES, bat_priv, |
84 | "Adding route towards: %pM (via %pM)\n", | 84 | "Adding route towards: %pM (via %pM)\n", |
85 | orig_node->orig, neigh_node->addr); | 85 | orig_node->orig, neigh_node->addr); |
86 | /* route changed */ | 86 | /* route changed */ |
87 | } else if (neigh_node && curr_router) { | 87 | } else if (neigh_node && curr_router) { |
88 | batadv_dbg(DBG_ROUTES, bat_priv, | 88 | batadv_dbg(BATADV_DBG_ROUTES, bat_priv, |
89 | "Changing route towards: %pM (now via %pM - was via %pM)\n", | 89 | "Changing route towards: %pM (now via %pM - was via %pM)\n", |
90 | orig_node->orig, neigh_node->addr, | 90 | orig_node->orig, neigh_node->addr, |
91 | curr_router->addr); | 91 | curr_router->addr); |
@@ -240,7 +240,7 @@ int batadv_window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, | |||
240 | return 1; | 240 | return 1; |
241 | 241 | ||
242 | *last_reset = jiffies; | 242 | *last_reset = jiffies; |
243 | batadv_dbg(DBG_BATMAN, bat_priv, | 243 | batadv_dbg(BATADV_DBG_BATMAN, bat_priv, |
244 | "old packet received, start protection\n"); | 244 | "old packet received, start protection\n"); |
245 | } | 245 | } |
246 | 246 | ||
@@ -618,7 +618,7 @@ int batadv_recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) | |||
618 | else | 618 | else |
619 | tt_flag = '.'; | 619 | tt_flag = '.'; |
620 | 620 | ||
621 | batadv_dbg(DBG_TT, bat_priv, | 621 | batadv_dbg(BATADV_DBG_TT, bat_priv, |
622 | "Routing TT_REQUEST to %pM [%c]\n", | 622 | "Routing TT_REQUEST to %pM [%c]\n", |
623 | tt_query->dst, | 623 | tt_query->dst, |
624 | tt_flag); | 624 | tt_flag); |
@@ -650,7 +650,7 @@ int batadv_recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) | |||
650 | tt_flag = 'F'; | 650 | tt_flag = 'F'; |
651 | else | 651 | else |
652 | tt_flag = '.'; | 652 | tt_flag = '.'; |
653 | batadv_dbg(DBG_TT, bat_priv, | 653 | batadv_dbg(BATADV_DBG_TT, bat_priv, |
654 | "Routing TT_RESPONSE to %pM [%c]\n", | 654 | "Routing TT_RESPONSE to %pM [%c]\n", |
655 | tt_query->dst, | 655 | tt_query->dst, |
656 | tt_flag); | 656 | tt_flag); |
@@ -703,7 +703,7 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if) | |||
703 | if (!orig_node) | 703 | if (!orig_node) |
704 | goto out; | 704 | goto out; |
705 | 705 | ||
706 | batadv_dbg(DBG_TT, bat_priv, | 706 | batadv_dbg(BATADV_DBG_TT, bat_priv, |
707 | "Received ROAMING_ADV from %pM (client %pM)\n", | 707 | "Received ROAMING_ADV from %pM (client %pM)\n", |
708 | roam_adv_packet->src, roam_adv_packet->client); | 708 | roam_adv_packet->src, roam_adv_packet->client); |
709 | 709 | ||
@@ -992,7 +992,7 @@ static int batadv_check_unicast_ttvn(struct bat_priv *bat_priv, | |||
992 | batadv_orig_node_free_ref(orig_node); | 992 | batadv_orig_node_free_ref(orig_node); |
993 | } | 993 | } |
994 | 994 | ||
995 | batadv_dbg(DBG_ROUTES, bat_priv, | 995 | batadv_dbg(BATADV_DBG_ROUTES, bat_priv, |
996 | "TTVN mismatch (old_ttvn %u new_ttvn %u)! Rerouting unicast packet (for %pM) to %pM\n", | 996 | "TTVN mismatch (old_ttvn %u new_ttvn %u)! Rerouting unicast packet (for %pM) to %pM\n", |
997 | unicast_packet->ttvn, curr_ttvn, ethhdr->h_dest, | 997 | unicast_packet->ttvn, curr_ttvn, ethhdr->h_dest, |
998 | unicast_packet->dest); | 998 | unicast_packet->dest); |