Attachment #34385 for bug #55501

Lines 16-22 Link Here

(-)linux-2.6.7-orig/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> /* __user */
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

Lines 22-27 Link Here

(-)linux-2.6.7-orig/include/linux/netfilter_ipv4/ip_tables.h (-3 / +4 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> /* __user */
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 283-290 Link Here
283	struct ipt_entry entrytable[0];	284	struct ipt_entry entrytable[0];
284	};	285	};
285		286
286	extern struct semaphore ipt_mutex;
287
288	/* Standard return verdict, or do jump. */	287	/* Standard return verdict, or do jump. */
289	#define IPT_STANDARD_TARGET ""	288	#define IPT_STANDARD_TARGET ""
290	/* Error verdict. */	289	/* Error verdict. */
Lines 336-344 Link Here
336	/*	335	/*
337	* Main firewall chains definitions and global var's definitions.	336	* Main firewall chains definitions and global var's definitions.
338	*/	337	*/
339	static DECLARE_MUTEX(ipt_mutex);
340	#ifdef __KERNEL__	338	#ifdef __KERNEL__
341		339
		340	extern struct semaphore ipt_mutex;
		341	static DECLARE_MUTEX(ipt_mutex);
		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;
344		345




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

#define IP6T_FUNCTION_MAXNAMELEN 30

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

static DECLARE_MUTEX(ip6t_mutex);

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


#ifdef __KERNEL__

static DECLARE_MUTEX(ip6t_mutex);

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


Return to bug 55501

Lines 22-27 Link Here

(-)linux-2.6.7-orig/include/linux/netfilter_ipv6/ip6_tables.h (-2 / +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> /* __user */
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-113 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
109	static DECLARE_MUTEX(ip6t_mutex);
110
111	/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */	110	/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
112	#define IP6T_F_PROTO 0x01 /* Set if rule cares about upper	111	#define IP6T_F_PROTO 0x01 /* Set if rule cares about upper
113	protocols */	112	protocols */
Lines 345-350 Link Here
345		344
346	#ifdef __KERNEL__	345	#ifdef __KERNEL__
347		346
		347	static DECLARE_MUTEX(ip6t_mutex);
		348
348	#include <linux/init.h>	349	#include <linux/init.h>
349	extern void ip6t_init(void) __init;	350	extern void ip6t_init(void) __init;
350		351