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

Commit e490c1de 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 0a17d8c7 4df53d8b

Documentation/feature-removal-schedule.txt

+0 −9
Original line number Diff line number Diff line
@@ -303,15 +303,6 @@ Who: Johannes Berg <johannes@sipsolutions.net> 


---------------------------



What: CONFIG_NF_CT_ACCT

When: 2.6.29

Why:  Accounting can now be enabled/disabled without kernel recompilation.

      Currently used only to set a default value for a feature that is also

      controlled by a kernel/module/sysfs/sysctl parameter.

Who:  Krzysztof Piotr Oledzki <ole@ans.pl>



---------------------------



What:	sysfs ui for changing p4-clockmod parameters

When:	September 2009

Why:	See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and

Documentation/kernel-parameters.txt

+1 −2
Original line number Diff line number Diff line
@@ -1597,8 +1597,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			[NETFILTER] Enable connection tracking flow accounting

			0 to disable accounting

			1 to enable accounting

			Default value depends on CONFIG_NF_CT_ACCT that is

			going to be removed in 2.6.29.

			Default value is 0.



	nfsaddrs=	[NFS]

			See Documentation/filesystems/nfs/nfsroot.txt.

include/linux/ip_vs.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */

#define IP_VS_SVC_F_PERSISTENT	0x0001		/* persistent port */

#define IP_VS_SVC_F_HASHED	0x0002		/* hashed entry */

#define IP_VS_SVC_F_ONEPACKET	0x0004		/* one-packet scheduling */



/*

 *      Destination Server Flags
@@ -85,6 +86,7 @@ 
#define IP_VS_CONN_F_SEQ_MASK	0x0600		/* in/out sequence mask */

#define IP_VS_CONN_F_NO_CPORT	0x0800		/* no client port set yet */

#define IP_VS_CONN_F_TEMPLATE	0x1000		/* template, not connection */

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



#define IP_VS_SCHEDNAME_MAXLEN	16

#define IP_VS_IFNAME_MAXLEN	16

include/linux/netfilter_ipv4/ipt_LOG.h

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
#define IPT_LOG_IPOPT		0x04	/* Log IP options */

#define IPT_LOG_UID		0x08	/* Log UID owning local socket */

#define IPT_LOG_NFLOG		0x10	/* Unsupported, don't reuse */

#define IPT_LOG_MASK		0x1f

#define IPT_LOG_MACDECODE	0x20	/* Decode MAC header */

#define IPT_LOG_MASK		0x2f



struct ipt_log_info {

	unsigned char level;

include/linux/netfilter_ipv6/ip6t_LOG.h

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
#define IP6T_LOG_IPOPT		0x04	/* Log IP options */

#define IP6T_LOG_UID		0x08	/* Log UID owning local socket */

#define IP6T_LOG_NFLOG		0x10	/* Unsupported, don't use */

#define IP6T_LOG_MASK		0x1f

#define IP6T_LOG_MACDECODE	0x20	/* Decode MAC header */

#define IP6T_LOG_MASK		0x2f



struct ip6t_log_info {

	unsigned char level;