Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219761
b: refs/heads/master
c: 81abee4
h: refs/heads/master
i:
  219759: 614fbd6
v: v3
  • Loading branch information
Sven Eckelmann authored and Greg Kroah-Hartman committed Sep 5, 2010
1 parent e523195 commit 18dd95e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 57b7117af84346c757be861c065ee790e4a62cb0
refs/heads/master: 81abee4f189e56892b2b3e654a46973ff3c3ab4e
15 changes: 7 additions & 8 deletions trunk/drivers/staging/batman-adv/routing.c
Original file line number Diff line number Diff line change
Expand Up @@ -859,9 +859,9 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,

/* send TTL exceeded if packet is an echo request (traceroute) */
if (icmp_packet->msg_type != ECHO_REQUEST) {
pr_warning("Warning - can't forward icmp packet from %pM to "
"%pM: ttl exceeded\n", icmp_packet->orig,
icmp_packet->dst);
pr_debug("Warning - can't forward icmp packet from %pM to "
"%pM: ttl exceeded\n", icmp_packet->orig,
icmp_packet->dst);
return NET_RX_DROP;
}

Expand Down Expand Up @@ -1141,9 +1141,9 @@ static int route_unicast_packet(struct sk_buff *skb,

/* TTL exceeded */
if (unicast_packet->ttl < 2) {
pr_warning("Warning - can't forward unicast packet from %pM to "
"%pM: ttl exceeded\n", ethhdr->h_source,
unicast_packet->dest);
pr_debug("Warning - can't forward unicast packet from %pM to "
"%pM: ttl exceeded\n", ethhdr->h_source,
unicast_packet->dest);
return NET_RX_DROP;
}

Expand Down Expand Up @@ -1224,8 +1224,7 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
hash_find(bat_priv->orig_hash, unicast_packet->orig));

if (!orig_node) {
pr_warning("couldn't find orig node for "
"fragmentation\n");
pr_debug("couldn't find orig node for fragmentation\n");
spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
flags);
return NET_RX_DROP;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/batman-adv/vis.c
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info)

packet = (struct vis_packet *)info->skb_packet->data;
if (packet->ttl < 2) {
pr_warning("Error - can't send vis packet: ttl exceeded\n");
pr_debug("Error - can't send vis packet: ttl exceeded\n");
return;
}

Expand Down

0 comments on commit 18dd95e

Please sign in to comment.