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

Commit e7bb5c71 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: remove flag field from struct nft_af_info 



Replace it by a direct check for the netdev protocol family.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent fe19c04c

include/net/netfilter/nf_tables.h

+0 −6
Original line number Diff line number Diff line
@@ -964,10 +964,6 @@ struct nft_table { 
	char				*name;

};



enum nft_af_flags {

	NFT_AF_NEEDS_DEV	= (1 << 0),

};



/**

 *	struct nft_af_info - nf_tables address family info

 *
@@ -975,14 +971,12 @@ enum nft_af_flags { 
 *	@family: address family

 *	@owner: module owner

 *	@tables: used internally

 *	@flags: family flags

 */

struct nft_af_info {

	struct list_head		list;

	int				family;

	struct module			*owner;

	struct list_head		tables;

	u32				flags;

};



int nft_register_afinfo(struct net *, struct nft_af_info *);

net/netfilter/nf_tables_api.c

+1 −1
Original line number Diff line number Diff line
@@ -1350,7 +1350,7 @@ static int nft_chain_parse_hook(struct net *net, 
	hook->type = type;



	hook->dev = NULL;

	if (afi->flags & NFT_AF_NEEDS_DEV) {

	if (afi->family == NFPROTO_NETDEV) {

		char ifname[IFNAMSIZ];



		if (!ha[NFTA_HOOK_DEV]) {

net/netfilter/nf_tables_netdev.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ nft_do_chain_netdev(void *priv, struct sk_buff *skb, 
static struct nft_af_info nft_af_netdev __read_mostly = {

	.family		= NFPROTO_NETDEV,

	.owner		= THIS_MODULE,

	.flags		= NFT_AF_NEEDS_DEV,

};



static int nf_tables_netdev_init_net(struct net *net)