aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/routing.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-03-07 03:07:45 -0500
committerMarek Lindner <lindner_marek@yahoo.de>2012-03-10 17:29:44 -0500
commit86ceb360565d06fcee96be85c4bafe9264756eca (patch)
treef0a6a8782cd740222a068f20f5c48ee84aeb5b80 /net/batman-adv/routing.c
parent7c64fd98ce512de6c6dae0452dc026446bd368d5 (diff)
batman-adv: Ignore 80-chars per line limits for strings
Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/routing.c')
-rw-r--r--net/batman-adv/routing.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index f53515562a4f..01b66d4a5aad 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -83,8 +83,7 @@ static void _update_route(struct bat_priv *bat_priv,
83 /* route changed */ 83 /* route changed */
84 } else if (neigh_node && curr_router) { 84 } else if (neigh_node && curr_router) {
85 bat_dbg(DBG_ROUTES, bat_priv, 85 bat_dbg(DBG_ROUTES, bat_priv,
86 "Changing route towards: %pM " 86 "Changing route towards: %pM (now via %pM - was via %pM)\n",
87 "(now via %pM - was via %pM)\n",
88 orig_node->orig, neigh_node->addr, 87 orig_node->orig, neigh_node->addr,
89 curr_router->addr); 88 curr_router->addr);
90 } 89 }
@@ -345,9 +344,8 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,
345 344
346 /* send TTL exceeded if packet is an echo request (traceroute) */ 345 /* send TTL exceeded if packet is an echo request (traceroute) */
347 if (icmp_packet->msg_type != ECHO_REQUEST) { 346 if (icmp_packet->msg_type != ECHO_REQUEST) {
348 pr_debug("Warning - can't forward icmp packet from %pM to " 347 pr_debug("Warning - can't forward icmp packet from %pM to %pM: ttl exceeded\n",
349 "%pM: ttl exceeded\n", icmp_packet->orig, 348 icmp_packet->orig, icmp_packet->dst);
350 icmp_packet->dst);
351 goto out; 349 goto out;
352 } 350 }
353 351
@@ -674,9 +672,9 @@ int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if)
674 if (!orig_node) 672 if (!orig_node)
675 goto out; 673 goto out;
676 674
677 bat_dbg(DBG_TT, bat_priv, "Received ROAMING_ADV from %pM " 675 bat_dbg(DBG_TT, bat_priv,
678 "(client %pM)\n", roam_adv_packet->src, 676 "Received ROAMING_ADV from %pM (client %pM)\n",
679 roam_adv_packet->client); 677 roam_adv_packet->src, roam_adv_packet->client);
680 678
681 tt_global_add(bat_priv, orig_node, roam_adv_packet->client, 679 tt_global_add(bat_priv, orig_node, roam_adv_packet->client,
682 atomic_read(&orig_node->last_ttvn) + 1, true, false); 680 atomic_read(&orig_node->last_ttvn) + 1, true, false);
@@ -813,9 +811,8 @@ int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
813 811
814 /* TTL exceeded */ 812 /* TTL exceeded */
815 if (unicast_packet->header.ttl < 2) { 813 if (unicast_packet->header.ttl < 2) {
816 pr_debug("Warning - can't forward unicast packet from %pM to " 814 pr_debug("Warning - can't forward unicast packet from %pM to %pM: ttl exceeded\n",
817 "%pM: ttl exceeded\n", ethhdr->h_source, 815 ethhdr->h_source, unicast_packet->dest);
818 unicast_packet->dest);
819 goto out; 816 goto out;
820 } 817 }
821 818
@@ -934,10 +931,10 @@ static int check_unicast_ttvn(struct bat_priv *bat_priv,
934 orig_node_free_ref(orig_node); 931 orig_node_free_ref(orig_node);
935 } 932 }
936 933
937 bat_dbg(DBG_ROUTES, bat_priv, "TTVN mismatch (old_ttvn %u " 934 bat_dbg(DBG_ROUTES, bat_priv,
938 "new_ttvn %u)! Rerouting unicast packet (for %pM) to " 935 "TTVN mismatch (old_ttvn %u new_ttvn %u)! Rerouting unicast packet (for %pM) to %pM\n",
939 "%pM\n", unicast_packet->ttvn, curr_ttvn, 936 unicast_packet->ttvn, curr_ttvn, ethhdr->h_dest,
940 ethhdr->h_dest, unicast_packet->dest); 937 unicast_packet->dest);
941 938
942 unicast_packet->ttvn = curr_ttvn; 939 unicast_packet->ttvn = curr_ttvn;
943 } 940 }