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

Commit 01e6de64 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 8f1ead2d d271e8bd

include/linux/netfilter/x_tables.h

+23 −0
Original line number Diff line number Diff line
@@ -437,6 +437,29 @@ extern void xt_free_table_info(struct xt_table_info *info); 
extern void xt_table_entry_swap_rcu(struct xt_table_info *old,

				    struct xt_table_info *new);



/*

 * This helper is performance critical and must be inlined

 */

static inline unsigned long ifname_compare_aligned(const char *_a,

						   const char *_b,

						   const char *_mask)

{

	const unsigned long *a = (const unsigned long *)_a;

	const unsigned long *b = (const unsigned long *)_b;

	const unsigned long *mask = (const unsigned long *)_mask;

	unsigned long ret;



	ret = (a[0] ^ b[0]) & mask[0];

	if (IFNAMSIZ > sizeof(unsigned long))

		ret |= (a[1] ^ b[1]) & mask[1];

	if (IFNAMSIZ > 2 * sizeof(unsigned long))

		ret |= (a[2] ^ b[2]) & mask[2];

	if (IFNAMSIZ > 3 * sizeof(unsigned long))

		ret |= (a[3] ^ b[3]) & mask[3];

	BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));

	return ret;

}



#ifdef CONFIG_COMPAT

#include <net/compat.h>

include/net/netfilter/nf_conntrack.h

+8 −6
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ struct nf_conn_help { 
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>

#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>



struct nf_conn

{

struct nf_conn {

	/* Usage count in here is 1 for hash table/destruct timer, 1 per skb,

           plus 1 for any connection(s) we are `master' for */

	struct nf_conntrack ct_general;
@@ -126,7 +125,6 @@ struct nf_conn 
#ifdef CONFIG_NET_NS

	struct net *ct_net;

#endif

	struct rcu_head rcu;

};



static inline struct nf_conn *
@@ -190,9 +188,13 @@ static inline void nf_ct_put(struct nf_conn *ct) 
extern int nf_ct_l3proto_try_module_get(unsigned short l3proto);

extern void nf_ct_l3proto_module_put(unsigned short l3proto);



extern struct hlist_head *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced);

extern void nf_ct_free_hashtable(struct hlist_head *hash, int vmalloced,

				 unsigned int size);

/*

 * Allocate a hashtable of hlist_head (if nulls == 0),

 * or hlist_nulls_head (if nulls == 1)

 */

extern void *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced, int nulls);



extern void nf_ct_free_hashtable(void *hash, int vmalloced, unsigned int size);



extern struct nf_conntrack_tuple_hash *

__nf_conntrack_find(struct net *net, const struct nf_conntrack_tuple *tuple);

include/net/netfilter/nf_conntrack_helper.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


struct module;



#define NF_CT_HELPER_NAME_LEN	16



struct nf_conntrack_helper

{

	struct hlist_node hnode;	/* Internal use. */

include/net/netfilter/nf_conntrack_l3proto.h

+7 −0
Original line number Diff line number Diff line
@@ -53,10 +53,17 @@ struct nf_conntrack_l3proto 
	int (*tuple_to_nlattr)(struct sk_buff *skb,

			       const struct nf_conntrack_tuple *t);



	/*

	 * Calculate size of tuple nlattr

	 */

	int (*nlattr_tuple_size)(void);



	int (*nlattr_to_tuple)(struct nlattr *tb[],

			       struct nf_conntrack_tuple *t);

	const struct nla_policy *nla_policy;



	size_t nla_size;



#ifdef CONFIG_SYSCTL

	struct ctl_table_header	*ctl_table_header;

	struct ctl_path		*ctl_table_path;

include/net/netfilter/nf_conntrack_l4proto.h

+7 −0
Original line number Diff line number Diff line
@@ -64,16 +64,22 @@ struct nf_conntrack_l4proto 
	/* convert protoinfo to nfnetink attributes */

	int (*to_nlattr)(struct sk_buff *skb, struct nlattr *nla,

			 const struct nf_conn *ct);

	/* Calculate protoinfo nlattr size */

	int (*nlattr_size)(void);



	/* convert nfnetlink attributes to protoinfo */

	int (*from_nlattr)(struct nlattr *tb[], struct nf_conn *ct);



	int (*tuple_to_nlattr)(struct sk_buff *skb,

			       const struct nf_conntrack_tuple *t);

	/* Calculate tuple nlattr size */

	int (*nlattr_tuple_size)(void);

	int (*nlattr_to_tuple)(struct nlattr *tb[],

			       struct nf_conntrack_tuple *t);

	const struct nla_policy *nla_policy;



	size_t nla_size;



#ifdef CONFIG_SYSCTL

	struct ctl_table_header	**ctl_table_header;

	struct ctl_table	*ctl_table;
@@ -107,6 +113,7 @@ extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, 
				      const struct nf_conntrack_tuple *tuple);

extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],

				      struct nf_conntrack_tuple *t);

extern int nf_ct_port_nlattr_tuple_size(void);

extern const struct nla_policy nf_ct_port_nla_policy[];



#ifdef CONFIG_SYSCTL