Commit 95337b98 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next 



Pablo Neira Ayuso says:

====================
Netfilter/IPVS updates for net-next

The following patchset contains Netfilter updates for net-next:

1) Remove the broute pseudo hook, implement this from the bridge
   prerouting hook instead. Now broute becomes real table in ebtables,
   from Florian Westphal. This also includes a size reduction patch for the
   bridge control buffer area via squashing boolean into bitfields and
   a selftest.

2) Add OS passive fingerprint version matching, from Fernando Fernandez.

3) Support for gue encapsulation for IPVS, from Jacky Hu.

4) Add support for NAT to the inet family, from Florian Westphal.
   This includes support for masquerade, redirect and nat extensions.

5) Skip interface lookup in flowtable, use device in the dst object.

6) Add jiffies64_to_msecs() and use it, from Li RongQing.

7) Remove unused parameter in nf_tables_set_desc_parse(), from Colin Ian King.

8) Statify several functions, patches from YueHaibing and Florian Westphal.

9) Add an optimized version of nf_inet_addr_cmp(), from Li RongQing.

10) Merge route extension to core, also from Florian.

11) Use IS_ENABLED(CONFIG_NF_NAT) instead of NF_NAT_NEEDED, from Florian.

12) Merge ip/ip6 masquerade extensions, from Florian. This includes
    netdevice notifier unification.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e62b2fd5 dc2f4189

include/linux/if_bridge.h

+0 −3
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ struct br_ip_list { 


extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));



typedef int br_should_route_hook_t(struct sk_buff *skb);

extern br_should_route_hook_t __rcu *br_should_route_hook;



#if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)

int br_multicast_list_adjacent(struct net_device *dev,

			       struct list_head *br_ip_list);

include/linux/jiffies.h

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ static inline u64 jiffies_to_nsecs(const unsigned long j) 
}



extern u64 jiffies64_to_nsecs(u64 j);

extern u64 jiffies64_to_msecs(u64 j);



extern unsigned long __msecs_to_jiffies(const unsigned int m);

#if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)

include/linux/netfilter.h

+8 −1
Original line number Diff line number Diff line
@@ -24,10 +24,17 @@ static inline int NF_DROP_GETERR(int verdict) 
static inline int nf_inet_addr_cmp(const union nf_inet_addr *a1,

				   const union nf_inet_addr *a2)

{

#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64

	const unsigned long *ul1 = (const unsigned long *)a1;

	const unsigned long *ul2 = (const unsigned long *)a2;



	return ((ul1[0] ^ ul2[0]) | (ul1[1] ^ ul2[1])) == 0UL;

#else

	return a1->all[0] == a2->all[0] &&

	       a1->all[1] == a2->all[1] &&

	       a1->all[2] == a2->all[2] &&

	       a1->all[3] == a2->all[3];

#endif

}



static inline void nf_inet_addr_mask(const union nf_inet_addr *a1,
@@ -360,7 +367,7 @@ extern struct nf_nat_hook __rcu *nf_nat_hook; 
static inline void

nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)

{

#ifdef CONFIG_NF_NAT_NEEDED

#if IS_ENABLED(CONFIG_NF_NAT)

	struct nf_nat_hook *nat_hook;



	rcu_read_lock();

include/linux/netfilter/nfnetlink_osf.h

+8 −3
Original line number Diff line number Diff line
@@ -21,13 +21,18 @@ struct nf_osf_finger { 
	struct nf_osf_user_finger	finger;

};



struct nf_osf_data {

	const char *genre;

	const char *version;

};



bool nf_osf_match(const struct sk_buff *skb, u_int8_t family,

		  int hooknum, struct net_device *in, struct net_device *out,

		  const struct nf_osf_info *info, struct net *net,

		  const struct list_head *nf_osf_fingers);



const char *nf_osf_find(const struct sk_buff *skb,

bool nf_osf_find(const struct sk_buff *skb,

		 const struct list_head *nf_osf_fingers,

			const int ttl_check);

		 const int ttl_check, struct nf_osf_data *data);



#endif /* _NFOSF_H */

include/linux/netfilter/x_tables.h

+0 −1
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ struct xt_table_info *xt_replace_table(struct xt_table *table, 
				       int *error);



struct xt_match *xt_find_match(u8 af, const char *name, u8 revision);

struct xt_target *xt_find_target(u8 af, const char *name, u8 revision);

struct xt_match *xt_request_find_match(u8 af, const char *name, u8 revision);

struct xt_target *xt_request_find_target(u8 af, const char *name, u8 revision);

int xt_find_revision(u8 af, const char *name, u8 revision, int target,

CRA Git | Maintained and supported by SUSTech CRA and CCSE