Commit 90278871 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/IPVS updates for your net-next
tree, more relevant updates in this batch are:

1) Add Maglev support to IPVS. Moreover, store lastest server weight in
   IPVS since this is needed by maglev, patches from from Inju Song.

2) Preparation works to add iptables flowtable support, patches
   from Felix Fietkau.

3) Hand over flows back to conntrack slow path in case of TCP RST/FIN
   packet is seen via new teardown state, also from Felix.

4) Add support for extended netlink error reporting for nf_tables.

5) Support for larger timeouts that 23 days in nf_tables, patch from
   Florian Westphal.

6) Always set an upper limit to dynamic sets, also from Florian.

7) Allow number generator to make map lookups, from Laura Garcia.

8) Use hash_32() instead of opencode hashing in IPVS, from Vicent Bernat.

9) Extend ip6tables SRH match to support previous, next and last SID,
   from Ahmed Abdelsalam.

10) Move Passive OS fingerprint nf_osf.c, from Fernando Fernandez.

11) Expose nf_conntrack_max through ctnetlink, from Florent Fourcot.

12) Several housekeeping patches for xt_NFLOG, x_tables and ebtables,
   from Taehee Yoo.

13) Unify meta bridge with core nft_meta, then make nft_meta built-in.
   Make rt and exthdr built-in too, again from Florian.

14) Missing initialization of tbl->entries in IPVS, from Cong Wang.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8fb11a9a b13468dc

include/linux/netfilter/nf_osf.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#include <uapi/linux/netfilter/nf_osf.h>



/* Initial window size option state machine: multiple of mss, mtu or

 * plain numeric value. Can also be made as plain numeric value which

 * is not a multiple of specified value.

 */

enum nf_osf_window_size_options {

	OSF_WSS_PLAIN   = 0,

	OSF_WSS_MSS,

	OSF_WSS_MTU,

	OSF_WSS_MODULO,

	OSF_WSS_MAX,

};



enum osf_fmatch_states {

	/* Packet does not match the fingerprint */

	FMATCH_WRONG = 0,

	/* Packet matches the fingerprint */

	FMATCH_OK,

	/* Options do not match the fingerprint, but header does */

	FMATCH_OPT_WRONG,

};



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);

include/linux/netfilter_bridge/ebtables.h

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#include <linux/if_ether.h>

#include <uapi/linux/netfilter_bridge/ebtables.h>



/* return values for match() functions */

#define EBT_MATCH 0

#define EBT_NOMATCH 1



struct ebt_match {

	struct list_head list;

	const char name[EBT_FUNCTION_MAXNAMELEN];

include/net/ip6_route.h

+21 −0
Original line number Diff line number Diff line
@@ -279,6 +279,27 @@ static inline bool rt6_duplicate_nexthop(struct fib6_info *a, struct fib6_info * 
	       !lwtunnel_cmp_encap(a->fib6_nh.nh_lwtstate, b->fib6_nh.nh_lwtstate);

}



static inline unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst)

{

	struct inet6_dev *idev;

	unsigned int mtu;



	if (dst_metric_locked(dst, RTAX_MTU)) {

		mtu = dst_metric_raw(dst, RTAX_MTU);

		if (mtu)

			return mtu;

	}



	mtu = IPV6_MIN_MTU;

	rcu_read_lock();

	idev = __in6_dev_get(dst->dev);

	if (idev)

		mtu = idev->cnf.mtu6;

	rcu_read_unlock();



	return mtu;

}



struct neighbour *ip6_neigh_lookup(const struct in6_addr *gw,

				   struct net_device *dev, struct sk_buff *skb,

				   const void *daddr);

include/net/ip_vs.h

+1 −0
Original line number Diff line number Diff line
@@ -668,6 +668,7 @@ struct ip_vs_dest { 
	volatile unsigned int	flags;		/* dest status flags */

	atomic_t		conn_flags;	/* flags to copy to conn */

	atomic_t		weight;		/* server weight */

	atomic_t		last_weight;	/* server latest weight */



	refcount_t		refcnt;		/* reference counter */

	struct ip_vs_stats      stats;          /* statistics */

include/net/ipv6.h

+0 −2
Original line number Diff line number Diff line
@@ -960,8 +960,6 @@ static inline struct sk_buff *ip6_finish_skb(struct sock *sk) 
			      &inet6_sk(sk)->cork);

}



unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst);



int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst,

		   struct flowi6 *fl6);

struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,

CRA Git | Maintained and supported by SUSTech CRA and CCSE