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

Commit 03eb57bb 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 updates for net-next

The following patchset contains Netfilter updates for net-next.
This round addresses fallout from previous pull request:

1) Remove #warning from ipt_LOG.h and ip6t_LOG.h headers,
   from Jeremy Sowden.

2) Incorrect parens in memcmp() in nft_bitwise, from Nathan Chancellor.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5181b473 83c156d3

include/uapi/linux/netfilter_ipv4/ipt_LOG.h

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef _IPT_LOG_H

#define _IPT_LOG_H



#warning "Please update iptables, this file will be removed soon!"



/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */

#define IPT_LOG_TCPSEQ		0x01	/* Log TCP sequence numbers */

#define IPT_LOG_TCPOPT		0x02	/* Log TCP options */

include/uapi/linux/netfilter_ipv6/ip6t_LOG.h

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef _IP6T_LOG_H

#define _IP6T_LOG_H



#warning "Please update iptables, this file will be removed soon!"



/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */

#define IP6T_LOG_TCPSEQ		0x01	/* Log TCP sequence numbers */

#define IP6T_LOG_TCPOPT		0x02	/* Log TCP options */

net/netfilter/nft_bitwise.c

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ static int nft_bitwise_offload(struct nft_offload_ctx *ctx, 
{

	const struct nft_bitwise *priv = nft_expr_priv(expr);



	if (memcmp(&priv->xor, &zero, sizeof(priv->xor) ||

	    priv->sreg != priv->dreg))

	if (memcmp(&priv->xor, &zero, sizeof(priv->xor)) ||

	    priv->sreg != priv->dreg)

		return -EOPNOTSUPP;



	memcpy(&ctx->regs[priv->dreg].mask, &priv->mask, sizeof(priv->mask));