From 18dd95e717c52a1546b34c30a93e37506cbeed80 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Sun, 5 Sep 2010 01:58:37 +0200
Subject: [PATCH] --- yaml --- r: 219761 b: refs/heads/master c:
 81abee4f189e56892b2b3e654a46973ff3c3ab4e h: refs/heads/master i:   219759:
 614fbd6ad51fa7aa79dad9759fc87972d18de302 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/batman-adv/routing.c | 15 +++++++--------
 trunk/drivers/staging/batman-adv/vis.c     |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 26a1d013e43d..7497a30540d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57b7117af84346c757be861c065ee790e4a62cb0
+refs/heads/master: 81abee4f189e56892b2b3e654a46973ff3c3ab4e
diff --git a/trunk/drivers/staging/batman-adv/routing.c b/trunk/drivers/staging/batman-adv/routing.c
index eda08b5efb02..e12fd995417c 100644
--- a/trunk/drivers/staging/batman-adv/routing.c
+++ b/trunk/drivers/staging/batman-adv/routing.c
@@ -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;
 	}
 
@@ -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;
 	}
 
@@ -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;
diff --git a/trunk/drivers/staging/batman-adv/vis.c b/trunk/drivers/staging/batman-adv/vis.c
index 071d3b7c4ea9..b2cec8e28969 100644
--- a/trunk/drivers/staging/batman-adv/vis.c
+++ b/trunk/drivers/staging/batman-adv/vis.c
@@ -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;
 	}