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

Commit 9941fb62 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 a5190b4e 3b1a1ce6

include/linux/in6.h

+4 −0
Original line number Diff line number Diff line
@@ -268,6 +268,10 @@ struct in6_flowlabel_req { 
/* RFC5082: Generalized Ttl Security Mechanism */

#define IPV6_MINHOPCOUNT		73



#define IPV6_ORIGDSTADDR        74

#define IPV6_RECVORIGDSTADDR    IPV6_ORIGDSTADDR

#define IPV6_TRANSPARENT        75



/*

 * Multicast Routing:

 * see include/linux/mroute6.h.

include/linux/ip_vs.h

+15 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 


/*

 *      IPVS Connection Flags

 *      Only flags 0..15 are sent to backup server

 */

#define IP_VS_CONN_F_FWD_MASK	0x0007		/* mask for the fwd methods */

#define IP_VS_CONN_F_MASQ	0x0000		/* masquerading/NAT */
@@ -88,9 +89,20 @@ 
#define IP_VS_CONN_F_TEMPLATE	0x1000		/* template, not connection */

#define IP_VS_CONN_F_ONE_PACKET	0x2000		/* forward only one packet */



/* Flags that are not sent to backup server start from bit 16 */

#define IP_VS_CONN_F_NFCT	(1 << 16)	/* use netfilter conntrack */



/* Connection flags from destination that can be changed by user space */

#define IP_VS_CONN_F_DEST_MASK (IP_VS_CONN_F_FWD_MASK | \

				IP_VS_CONN_F_ONE_PACKET | \

				IP_VS_CONN_F_NFCT | \

				0)



#define IP_VS_SCHEDNAME_MAXLEN	16

#define IP_VS_PENAME_MAXLEN	16

#define IP_VS_IFNAME_MAXLEN	16



#define IP_VS_PEDATA_MAXLEN     255



/*

 *	The struct ip_vs_service_user and struct ip_vs_dest_user are
@@ -324,6 +336,9 @@ enum { 
	IPVS_SVC_ATTR_NETMASK,		/* persistent netmask */



	IPVS_SVC_ATTR_STATS,		/* nested attribute for service stats */



	IPVS_SVC_ATTR_PE_NAME,		/* name of ct retriever */



	__IPVS_SVC_ATTR_MAX,

};

include/linux/ipv6.h

+3 −1
Original line number Diff line number Diff line
@@ -341,7 +341,9 @@ struct ipv6_pinfo { 
				odstopts:1,

                                rxflow:1,

				rxtclass:1,

				rxpmtu:1;

				rxpmtu:1,

				rxorigdstaddr:1;

				/* 2 bits hole */

		} bits;

		__u16		all;

	} rxopt;

include/linux/netfilter/nf_conntrack_common.h

+6 −0
Original line number Diff line number Diff line
@@ -98,8 +98,14 @@ enum ip_conntrack_events { 


enum ip_conntrack_expect_events {

	IPEXP_NEW,		/* new expectation */

	IPEXP_DESTROY,		/* destroyed expectation */

};



/* expectation flags */

#define NF_CT_EXPECT_PERMANENT		0x1

#define NF_CT_EXPECT_INACTIVE		0x2

#define NF_CT_EXPECT_USERSPACE		0x4



#ifdef __KERNEL__

struct ip_conntrack_stat {

	unsigned int searched;

include/linux/netfilter/nf_conntrack_sip.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ enum sip_header_types { 
	SIP_HDR_VIA_TCP,

	SIP_HDR_EXPIRES,

	SIP_HDR_CONTENT_LENGTH,

	SIP_HDR_CALL_ID,

};



enum sdp_header_types {