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

Commit 11352851 authored by Florian Westphal's avatar Florian Westphal Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_tables: use net_generic infra for transaction data 



[ 0854db2aaef3fcdd3498a9d299c60adea2aa3dc6 ]

This moves all nf_tables pernet data from struct net to a net_generic
extension, with the exception of the gencursor.

The latter is used in the data path and also outside of the nf_tables
core. All others are only used from the configuration plane.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d59ed9dc

include/net/netfilter/nf_tables.h

+10 −0
Original line number Diff line number Diff line
@@ -1472,4 +1472,14 @@ void nf_tables_trans_destroy_flush_work(void); 
int nf_msecs_to_jiffies64(const struct nlattr *nla, u64 *result);

__be64 nf_jiffies64_to_msecs(u64 input);



struct nftables_pernet {

	struct list_head	tables;

	struct list_head	commit_list;

	struct list_head	module_list;

	struct list_head	notify_list;

	struct mutex		commit_mutex;

	unsigned int		base_seq;

	u8			validate_state;

};



#endif /* _NET_NF_TABLES_H */

include/net/netns/nftables.h

+0 −6
Original line number Diff line number Diff line
@@ -5,13 +5,7 @@ 
#include <linux/list.h>



struct netns_nftables {

	struct list_head	tables;

	struct list_head	commit_list;

	struct list_head	module_list;

	struct mutex		commit_mutex;

	unsigned int		base_seq;

	u8			gencursor;

	u8			validate_state;

};



#endif