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

Commit 5cd856a5 authored by David S. Miller's avatar David S. Miller
Browse files

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



Pablo Neira Ayuso says:

====================
Netfilter/IPVS fixes for net

The following patchset contains Netfilter/IPVS fixes for net:

1) Follow up patch to fix a compilation warning in a recent IPVS fix:
   098e13f5 ("ipvs: fix dependency on nf_defrag_ipv6").

2) Bogus ENOENT error on flush after rule deletion in the same batch,
   reported by Phil Sutter.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f43f400 c93a49b9

net/netfilter/ipvs/ip_vs_ctl.c

+2 −1
Original line number Diff line number Diff line
@@ -896,12 +896,13 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, 
{

	struct ip_vs_dest *dest;

	unsigned int atype, i;

	int ret = 0;



	EnterFunction(2);



#ifdef CONFIG_IP_VS_IPV6

	if (udest->af == AF_INET6) {

		int ret;



		atype = ipv6_addr_type(&udest->addr.in6);

		if ((!(atype & IPV6_ADDR_UNICAST) ||

			atype & IPV6_ADDR_LINKLOCAL) &&

net/netfilter/nf_tables_api.c

+3 −0
Original line number Diff line number Diff line
@@ -313,6 +313,9 @@ static int nft_delrule_by_chain(struct nft_ctx *ctx) 
	int err;



	list_for_each_entry(rule, &ctx->chain->rules, list) {

		if (!nft_is_active_next(ctx->net, rule))

			continue;



		err = nft_delrule(ctx, rule);

		if (err < 0)

			return err;