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

Commit 9a0da0d1 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 ec282e92 8a56df0a

Documentation/feature-removal-schedule.txt

+0 −25
Original line number Diff line number Diff line
@@ -264,31 +264,6 @@ Who: Thomas Gleixner <tglx@linutronix.de> 
---------------------------



What (Why):

	- include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files

	  (superseded by xt_TOS/xt_tos target & match)



	- "forwarding" header files like ipt_mac.h in

	  include/linux/netfilter_ipv4/ and include/linux/netfilter_ipv6/



	- xt_CONNMARK match revision 0

	  (superseded by xt_CONNMARK match revision 1)



	- xt_MARK target revisions 0 and 1

	  (superseded by xt_MARK match revision 2)



	- xt_connmark match revision 0

	  (superseded by xt_connmark match revision 1)



	- xt_conntrack match revision 0

	  (superseded by xt_conntrack match revision 1)



	- xt_iprange match revision 0,

	  include/linux/netfilter_ipv4/ipt_iprange.h

	  (superseded by xt_iprange match revision 1)



	- xt_mark match revision 0

	  (superseded by xt_mark match revision 1)



	- xt_recent: the old ipt_recent proc dir

	  (superseded by /proc/net/xt_recent)

include/linux/netfilter/nfnetlink.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ struct nfgenmsg { 
struct nfnl_callback

{

	int (*call)(struct sock *nl, struct sk_buff *skb, 

		struct nlmsghdr *nlh, struct nlattr *cda[]);

		    const struct nlmsghdr *nlh,

		    const struct nlattr * const cda[]);

	const struct nla_policy *policy;	/* netlink attribute policy */

	const u_int16_t attr_count;		/* number of nlattr's */

};

include/linux/netfilter/x_tables.h

+2 −2
Original line number Diff line number Diff line
@@ -238,9 +238,9 @@ struct xt_mtdtor_param { 
 */

struct xt_target_param {

	const struct net_device *in, *out;

	unsigned int hooknum;

	const struct xt_target *target;

	const void *targinfo;

	unsigned int hooknum;

	u_int8_t family;

};
@@ -407,7 +407,7 @@ extern int xt_check_target(struct xt_tgchk_param *, 
			   unsigned int size, u_int8_t proto, bool inv_proto);



extern struct xt_table *xt_register_table(struct net *net,

					  struct xt_table *table,

					  const struct xt_table *table,

					  struct xt_table_info *bootstrap,

					  struct xt_table_info *newinfo);

extern void *xt_unregister_table(struct xt_table *table);

include/linux/netfilter/xt_CONNMARK.h

+0 −6
Original line number Diff line number Diff line
@@ -18,12 +18,6 @@ enum { 
	XT_CONNMARK_RESTORE

};



struct xt_connmark_target_info {

	unsigned long mark;

	unsigned long mask;

	__u8 mode;

};



struct xt_connmark_tginfo1 {

	__u32 ctmark, ctmask, nfmask;

	__u8 mode;

include/linux/netfilter/xt_MARK.h

+0 −17
Original line number Diff line number Diff line
@@ -3,23 +3,6 @@ 


#include <linux/types.h>



/* Version 0 */

struct xt_mark_target_info {

	unsigned long mark;

};



/* Version 1 */

enum {

	XT_MARK_SET=0,

	XT_MARK_AND,

	XT_MARK_OR,

};



struct xt_mark_target_info_v1 {

	unsigned long mark;

	__u8 mode;

};



struct xt_mark_tginfo2 {

	__u32 mark, mask;

};