Attachment #34391 for bug #55501

Lines 10-15 Link Here

(-)1.9/include/linux/netfilter.h (+1 lines)
10	#include <linux/wait.h>	10	#include <linux/wait.h>
11	#include <linux/list.h>	11	#include <linux/list.h>
12	#endif	12	#endif
		13	#include <linux/compiler.h>
13		14
14	/* Responses from hook functions. */	15	/* Responses from hook functions. */
15	#define NF_DROP 0	16	#define NF_DROP 0

Lines 16-22 Link Here

(-)1.3/include/linux/netfilter_arp/arp_tables.h (-1 / +1 lines)
16	#include <linux/if_arp.h>	16	#include <linux/if_arp.h>
17	#include <linux/skbuff.h>	17	#include <linux/skbuff.h>
18	#endif	18	#endif
19		19	#include <linux/compiler.h>
20	#include <linux/netfilter_arp.h>	20	#include <linux/netfilter_arp.h>
21		21
22	#define ARPT_FUNCTION_MAXNAMELEN 30	22	#define ARPT_FUNCTION_MAXNAMELEN 30




#include <linux/ip.h>
#include <linux/skbuff.h>
#endif
#include <linux/compiler.h>
#include <linux/netfilter_ipv4.h>

#define IPT_FUNCTION_MAXNAMELEN 30

/*
 *	Main firewall chains definitions and global var's definitions.
 */
static DECLARE_MUTEX(ipt_mutex);
#ifdef __KERNEL__
static DECLARE_MUTEX(ipt_mutex);

#include <linux/init.h>
extern void ipt_init(void) __init;




#include <linux/ipv6.h>
#include <linux/skbuff.h>
#endif
#include <linux/compiler.h>
#include <linux/netfilter_ipv6.h>

#define IP6T_FUNCTION_MAXNAMELEN 30

	u_int64_t pcnt, bcnt;			/* Packet and byte counters */
};

#ifdef __KERNEL__
static DECLARE_MUTEX(ip6t_mutex);
#endif

/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
#define IP6T_F_PROTO		0x01	/* Set if rule cares about upper 

Return to bug 55501

Lines 22-27 Link Here

(-)1.6/include/linux/netfilter_ipv6/ip6_tables.h (+3 lines)
22	#include <linux/ipv6.h>	22	#include <linux/ipv6.h>
23	#include <linux/skbuff.h>	23	#include <linux/skbuff.h>
24	#endif	24	#endif
		25	#include <linux/compiler.h>
25	#include <linux/netfilter_ipv6.h>	26	#include <linux/netfilter_ipv6.h>
26		27
27	#define IP6T_FUNCTION_MAXNAMELEN 30	28	#define IP6T_FUNCTION_MAXNAMELEN 30
Lines 106-112 Link Here
106	u_int64_t pcnt, bcnt; /* Packet and byte counters */	107	u_int64_t pcnt, bcnt; /* Packet and byte counters */
107	};	108	};
108		109
		110	#ifdef __KERNEL__
109	static DECLARE_MUTEX(ip6t_mutex);	111	static DECLARE_MUTEX(ip6t_mutex);
		112	#endif
110		113
111	/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */	114	/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
112	#define IP6T_F_PROTO 0x01 /* Set if rule cares about upper	115	#define IP6T_F_PROTO 0x01 /* Set if rule cares about upper

Lines 22-27 Link Here

(-)1.7/include/linux/netfilter_ipv4/ip_tables.h (-1 / +2 lines)
22	#include <linux/ip.h>	22	#include <linux/ip.h>
23	#include <linux/skbuff.h>	23	#include <linux/skbuff.h>
24	#endif	24	#endif
		25	#include <linux/compiler.h>
25	#include <linux/netfilter_ipv4.h>	26	#include <linux/netfilter_ipv4.h>
26		27
27	#define IPT_FUNCTION_MAXNAMELEN 30	28	#define IPT_FUNCTION_MAXNAMELEN 30
Lines 336-343 Link Here
336	/*	337	/*
337	* Main firewall chains definitions and global var's definitions.	338	* Main firewall chains definitions and global var's definitions.
338	*/	339	*/
339	static DECLARE_MUTEX(ipt_mutex);
340	#ifdef __KERNEL__	340	#ifdef __KERNEL__
		341	static DECLARE_MUTEX(ipt_mutex);
341		342
342	#include <linux/init.h>	343	#include <linux/init.h>
343	extern void ipt_init(void) __init;	344	extern void ipt_init(void) __init;