Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81abee4f authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Greg Kroah-Hartman
Browse files

Staging: batman-adv: Don't inform about dropped packets in nodebug 



Information about dropped packets are usually only interesting for
debugging purposes and otherwise open the possibility to flood the logs
of the target machine with useless information.

pr_debug will not output those information on a nodebug kernel.

Reported-by: default avatarVasiliy Kulikov <segooon@gmail.com>
Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 57b7117a

drivers/staging/batman-adv/routing.c

+7 −8
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ 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 "

		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,7 +1141,7 @@ 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 "

		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;

drivers/staging/batman-adv/vis.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}