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

Commit a4efbaf6 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 your net-next tree:

1) Use lockdep_is_held() in ipset_dereference_protected(), from Lance Roy.

2) Remove unused variable in cttimeout, from YueHaibing.

3) Add ttl option for nft_osf, from Fernando Fernandez Mancera.

4) Use xfrm family to deal with IPv6-in-IPv4 packets from nft_xfrm,
   from Florian Westphal.

5) Simplify xt_osf_match_packet().

6) Missing ct helper alias definition in snmp_trap helper, from Taehee Yoo.

7) Remove unnecessary parameter in nf_flow_table_cleanup(), from Taehee Yoo.

8) Remove unused variable definitions in nft_{dup,fwd}, from Weongyo Jeong.

9) Remove empty net/netfilter/nfnetlink_log.h file, from Taehee Yoo.

10) Revert xt_quota updates remain option due to problems in the listing
    path for 32-bit arches, from Maze.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4c16128b af510ebd

include/linux/netfilter/nfnetlink_osf.h

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ bool nf_osf_match(const struct sk_buff *skb, u_int8_t family, 
		  const struct list_head *nf_osf_fingers);



const char *nf_osf_find(const struct sk_buff *skb,

                        const struct list_head *nf_osf_fingers);

			const struct list_head *nf_osf_fingers,

			const int ttl_check);



#endif /* _NFOSF_H */

include/net/netfilter/nf_flow_table.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int nf_flow_table_iterate(struct nf_flowtable *flow_table, 
			  void (*iter)(struct flow_offload *flow, void *data),

			  void *data);



void nf_flow_table_cleanup(struct net *net, struct net_device *dev);

void nf_flow_table_cleanup(struct net_device *dev);



int nf_flow_table_init(struct nf_flowtable *flow_table);

void nf_flow_table_free(struct nf_flowtable *flow_table);

include/net/netfilter/nfnetlink_log.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

include/uapi/linux/netfilter/nf_tables.h

+7 −0
Original line number Diff line number Diff line
@@ -1511,9 +1511,16 @@ enum nft_flowtable_hook_attributes { 
};

#define NFTA_FLOWTABLE_HOOK_MAX	(__NFTA_FLOWTABLE_HOOK_MAX - 1)



/**

 * enum nft_osf_attributes - nftables osf expression netlink attributes

 *

 * @NFTA_OSF_DREG: destination register (NLA_U32: nft_registers)

 * @NFTA_OSF_TTL: Value of the TTL osf option (NLA_U8)

 */

enum nft_osf_attributes {

	NFTA_OSF_UNSPEC,

	NFTA_OSF_DREG,

	NFTA_OSF_TTL,

	__NFTA_OSF_MAX,

};

#define NFTA_OSF_MAX (__NFTA_OSF_MAX - 1)

include/uapi/linux/netfilter/xt_quota.h

+3 −5
Original line number Diff line number Diff line
@@ -15,11 +15,9 @@ struct xt_quota_info { 
	__u32 flags;

	__u32 pad;

	__aligned_u64 quota;

#ifdef __KERNEL__

	atomic64_t counter;

#else

	__aligned_u64 remain;

#endif



	/* Used internally by the kernel */

	struct xt_quota_priv	*master;

};



#endif /* _XT_QUOTA_H */