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

Commit 18b8afc7 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: Kill nf_debug 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e45b1be8

include/linux/netfilter_ipv4.h

+0 −6
Original line number Diff line number Diff line
@@ -75,12 +75,6 @@ enum nf_ip_hook_priorities { 
#define SO_ORIGINAL_DST 80



#ifdef __KERNEL__

#ifdef CONFIG_NETFILTER_DEBUG

void nf_debug_ip_local_deliver(struct sk_buff *skb);

void nf_debug_ip_loopback_xmit(struct sk_buff *newskb);

void nf_debug_ip_finish_output2(struct sk_buff *skb);

#endif /*CONFIG_NETFILTER_DEBUG*/



extern int ip_route_me_harder(struct sk_buff **pskb);



/* Call this before modifying an existing IP packet: ensures it is

include/linux/skbuff.h

+0 −13
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ struct skb_shared_info { 
 *	@nfcache: Cache info

 *	@nfct: Associated connection, if any

 *	@nfctinfo: Relationship of this skb to the connection

 *	@nf_debug: Netfilter debugging

 *	@nf_bridge: Saved data about a bridged frame - see br_netfilter.c

 *      @private: Data which is private to the HIPPI implementation

 *	@tc_index: Traffic control index
@@ -264,9 +263,6 @@ struct sk_buff { 
	__u32			nfcache;

	__u32			nfctinfo;

	struct nf_conntrack	*nfct;

#ifdef CONFIG_NETFILTER_DEBUG

        unsigned int		nf_debug;

#endif

#ifdef CONFIG_BRIDGE_NETFILTER

	struct nf_bridge_info	*nf_bridge;

#endif
@@ -1219,15 +1215,6 @@ static inline void nf_reset(struct sk_buff *skb) 
{

	nf_conntrack_put(skb->nfct);

	skb->nfct = NULL;

#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug = 0;

#endif

}

static inline void nf_reset_debug(struct sk_buff *skb)

{

#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug = 0;

#endif

}



#ifdef CONFIG_BRIDGE_NETFILTER

net/bridge/br_forward.c

+0 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ int br_forward_finish(struct sk_buff *skb) 
static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb)

{

	skb->dev = to->dev;

#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug = 0;

#endif

	NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,

			br_forward_finish);

}

net/bridge/br_input.c

+0 −4
Original line number Diff line number Diff line
@@ -23,11 +23,7 @@ const unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; 


static int br_pass_frame_up_finish(struct sk_buff *skb)

{

#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug = 0;

#endif

	netif_receive_skb(skb);



	return 0;

}

net/bridge/br_netfilter.c

+0 −38
Original line number Diff line number Diff line
@@ -102,10 +102,6 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb) 
{

	struct nf_bridge_info *nf_bridge = skb->nf_bridge;



#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug ^= (1 << NF_BR_PRE_ROUTING);

#endif



	if (nf_bridge->mask & BRNF_PKT_TYPE) {

		skb->pkt_type = PACKET_OTHERHOST;

		nf_bridge->mask ^= BRNF_PKT_TYPE;
@@ -182,10 +178,6 @@ static void __br_dnat_complain(void) 
 * --Bart, 20021007 (updated) */

static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)

{

#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug |= (1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_FORWARD);

#endif



	if (skb->pkt_type == PACKET_OTHERHOST) {

		skb->pkt_type = PACKET_HOST;

		skb->nf_bridge->mask |= BRNF_PKT_TYPE;
@@ -207,10 +199,6 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb) 
	struct iphdr *iph = skb->nh.iph;

	struct nf_bridge_info *nf_bridge = skb->nf_bridge;



#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug ^= (1 << NF_BR_PRE_ROUTING);

#endif



	if (nf_bridge->mask & BRNF_PKT_TYPE) {

		skb->pkt_type = PACKET_OTHERHOST;

		nf_bridge->mask ^= BRNF_PKT_TYPE;
@@ -382,9 +370,6 @@ static unsigned int br_nf_pre_routing_ipv6(unsigned int hook, 
	if (hdr->nexthdr == NEXTHDR_HOP && check_hbh_len(skb))

			goto inhdr_error;



#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug ^= (1 << NF_IP6_PRE_ROUTING);

#endif

	if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)

		return NF_DROP;

	setup_pre_routing(skb);
@@ -468,9 +453,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb, 
			skb->ip_summed = CHECKSUM_NONE;

	}



#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug ^= (1 << NF_IP_PRE_ROUTING);

#endif

	if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)

		return NF_DROP;

	setup_pre_routing(skb);
@@ -517,10 +499,6 @@ static int br_nf_forward_finish(struct sk_buff *skb) 
	struct net_device *in;

	struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);



#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug ^= (1 << NF_BR_FORWARD);

#endif



	if (skb->protocol != __constant_htons(ETH_P_ARP) && !IS_VLAN_ARP) {

		in = nf_bridge->physindev;

		if (nf_bridge->mask & BRNF_PKT_TYPE) {
@@ -566,9 +544,6 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb, 
		(*pskb)->nh.raw += VLAN_HLEN;

	}



#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug ^= (1 << NF_BR_FORWARD);

#endif

	nf_bridge = skb->nf_bridge;

	if (skb->pkt_type == PACKET_OTHERHOST) {

		skb->pkt_type = PACKET_HOST;
@@ -605,10 +580,6 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb, 
		(*pskb)->nh.raw += VLAN_HLEN;

	}



#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug ^= (1 << NF_BR_FORWARD);

#endif



	if (skb->nh.arph->ar_pln != 4) {

		if (IS_VLAN_ARP) {

			skb_push(*pskb, VLAN_HLEN);
@@ -627,9 +598,6 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb, 
/* PF_BRIDGE/LOCAL_OUT ***********************************************/

static int br_nf_local_out_finish(struct sk_buff *skb)

{

#ifdef CONFIG_NETFILTER_DEBUG

	skb->nf_debug &= ~(1 << NF_BR_LOCAL_OUT);

#endif

	if (skb->protocol == __constant_htons(ETH_P_8021Q)) {

		skb_push(skb, VLAN_HLEN);

		skb->nh.raw -= VLAN_HLEN;
@@ -731,10 +699,6 @@ static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb, 
			       realoutdev, br_nf_local_out_finish,

			       NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD + 1);

	} else {

#ifdef CONFIG_NETFILTER_DEBUG

		skb->nf_debug ^= (1 << NF_IP_LOCAL_OUT);

#endif



		NF_HOOK_THRESH(pf, NF_IP_LOCAL_OUT, skb, realindev,

			       realoutdev, br_nf_local_out_finish,

			       NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT + 1);
@@ -779,8 +743,6 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, 
		printk(KERN_CRIT "br_netfilter: skb->dst == NULL.");

		goto print_error;

	}



	skb->nf_debug ^= (1 << NF_IP_POST_ROUTING);

#endif



	/* We assume any code from br_dev_queue_push_xmit onwards doesn't care