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

Commit 8394e9b2 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[NETFILTER] bridge: debug message fixes 



If CONFIG_NETFILTER_DEBUG is enabled, it shouldn't change the
actions of the filtering. The message about skb->dst being NULL
is commonly triggered by dhclient, so it is useless. Make sure all
messages end in newline.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9bcfcaf5

net/bridge/br_netfilter.c

+3 −12
Original line number Diff line number Diff line
@@ -718,16 +718,6 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb, 
	else

		pf = PF_INET6;



#ifdef CONFIG_NETFILTER_DEBUG

	/* Sometimes we get packets with NULL ->dst here (for example,

	 * running a dhcp client daemon triggers this). This should now

	 * be fixed, but let's keep the check around. */

	if (skb->dst == NULL) {

		printk(KERN_CRIT "br_netfilter: skb->dst == NULL.");

		return NF_ACCEPT;

	}

#endif



	nf_bridge = skb->nf_bridge;

	nf_bridge->physoutdev = skb->dev;

	realindev = nf_bridge->physindev;
@@ -809,7 +799,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, 
	 * keep the check just to be sure... */

	if (skb->mac.raw < skb->head || skb->mac.raw + ETH_HLEN > skb->data) {

		printk(KERN_CRIT "br_netfilter: Argh!! br_nf_post_routing: "

		       "bad mac.raw pointer.");

		       "bad mac.raw pointer.\n");

		goto print_error;

	}

#endif
@@ -827,7 +817,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, 


#ifdef CONFIG_NETFILTER_DEBUG

	if (skb->dst == NULL) {

		printk(KERN_CRIT "br_netfilter: skb->dst == NULL.");

		printk(KERN_INFO "br_netfilter post_routing: skb->dst == NULL\n");

		goto print_error;

	}

#endif
@@ -864,6 +854,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, 
	}

	printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,

	       skb->data);

	dump_stack();

	return NF_ACCEPT;

#endif

}