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

Commit 83bf2e40 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

parents de384830 6661481d

include/linux/netfilter/Kbuild

+4 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ header-y += nf_conntrack_tuple_common.h 
header-y += nfnetlink_conntrack.h

header-y += nfnetlink_log.h

header-y += nfnetlink_queue.h

header-y += xt_CHECKSUM.h

header-y += xt_CLASSIFY.h

header-y += xt_CONNMARK.h

header-y += xt_CONNSECMARK.h
@@ -19,17 +20,19 @@ header-y += xt_TCPMSS.h 
header-y += xt_TCPOPTSTRIP.h

header-y += xt_TEE.h

header-y += xt_TPROXY.h

header-y += xt_cluster.h

header-y += xt_comment.h

header-y += xt_connbytes.h

header-y += xt_connlimit.h

header-y += xt_connmark.h

header-y += xt_conntrack.h

header-y += xt_cluster.h

header-y += xt_cpu.h

header-y += xt_dccp.h

header-y += xt_dscp.h

header-y += xt_esp.h

header-y += xt_hashlimit.h

header-y += xt_iprange.h

header-y += xt_ipvs.h

header-y += xt_helper.h

header-y += xt_length.h

header-y += xt_limit.h

include/linux/netfilter/nfnetlink_log.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ enum nfulnl_attr_config { 
#define NFULNL_COPY_NONE	0x00

#define NFULNL_COPY_META	0x01

#define NFULNL_COPY_PACKET	0x02

#define NFULNL_COPY_DISABLED	0x03

/* 0xff is reserved, don't use it for new copy modes. */



#define NFULNL_CFG_F_SEQ	0x0001

#define NFULNL_CFG_F_SEQ_GLOBAL	0x0002

include/linux/netfilter/xt_CHECKSUM.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* Header file for iptables ipt_CHECKSUM target

 *

 * (C) 2002 by Harald Welte <laforge@gnumonks.org>

 * (C) 2010 Red Hat Inc

 * Author: Michael S. Tsirkin <mst@redhat.com>

 *

 * This software is distributed under GNU GPL v2, 1991

*/

#ifndef _XT_CHECKSUM_TARGET_H

#define _XT_CHECKSUM_TARGET_H



#include <linux/types.h>



#define XT_CHECKSUM_OP_FILL	0x01	/* fill in checksum in IP header */



struct xt_CHECKSUM_info {

	__u8 operation;	/* bitset of operations */

};



#endif /* _XT_CHECKSUM_TARGET_H */

include/linux/netfilter/xt_cpu.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#ifndef _XT_CPU_H

#define _XT_CPU_H



#include <linux/types.h>



struct xt_cpu_info {

	__u32	cpu;

	__u32	invert;

};



#endif /*_XT_CPU_H*/

include/linux/netfilter/xt_ipvs.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef _XT_IPVS_H

#define _XT_IPVS_H



enum {

	XT_IPVS_IPVS_PROPERTY =	1 << 0, /* all other options imply this one */

	XT_IPVS_PROTO =		1 << 1,

	XT_IPVS_VADDR =		1 << 2,

	XT_IPVS_VPORT =		1 << 3,

	XT_IPVS_DIR =		1 << 4,

	XT_IPVS_METHOD =	1 << 5,

	XT_IPVS_VPORTCTL =	1 << 6,

	XT_IPVS_MASK =		(1 << 7) - 1,

	XT_IPVS_ONCE_MASK =	XT_IPVS_MASK & ~XT_IPVS_IPVS_PROPERTY

};



struct xt_ipvs_mtinfo {

	union nf_inet_addr	vaddr, vmask;

	__be16			vport;

	__u8			l4proto;

	__u8			fwd_method;

	__be16			vportctl;



	__u8			invert;

	__u8			bitmask;

};



#endif /* _XT_IPVS_H */