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

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
...@@ -964,10 +964,6 @@ struct nft_table { ...@@ -964,10 +964,6 @@ struct nft_table {
char *name; char *name;
}; };
enum nft_af_flags {
NFT_AF_NEEDS_DEV = (1 << 0),
};
/** /**
* struct nft_af_info - nf_tables address family info * struct nft_af_info - nf_tables address family info
* *
...@@ -975,14 +971,12 @@ enum nft_af_flags { ...@@ -975,14 +971,12 @@ enum nft_af_flags {
* @family: address family * @family: address family
* @owner: module owner * @owner: module owner
* @tables: used internally * @tables: used internally
* @flags: family flags
*/ */
struct nft_af_info { struct nft_af_info {
struct list_head list; struct list_head list;
int family; int family;
struct module *owner; struct module *owner;
struct list_head tables; struct list_head tables;
u32 flags;
}; };
int nft_register_afinfo(struct net *, struct nft_af_info *); int nft_register_afinfo(struct net *, struct nft_af_info *);
......
...@@ -1350,7 +1350,7 @@ static int nft_chain_parse_hook(struct net *net, ...@@ -1350,7 +1350,7 @@ static int nft_chain_parse_hook(struct net *net,
hook->type = type; hook->type = type;
hook->dev = NULL; hook->dev = NULL;
if (afi->flags & NFT_AF_NEEDS_DEV) { if (afi->family == NFPROTO_NETDEV) {
char ifname[IFNAMSIZ]; char ifname[IFNAMSIZ];
if (!ha[NFTA_HOOK_DEV]) { if (!ha[NFTA_HOOK_DEV]) {
......
...@@ -41,7 +41,6 @@ nft_do_chain_netdev(void *priv, struct sk_buff *skb, ...@@ -41,7 +41,6 @@ nft_do_chain_netdev(void *priv, struct sk_buff *skb,
static struct nft_af_info nft_af_netdev __read_mostly = { static struct nft_af_info nft_af_netdev __read_mostly = {
.family = NFPROTO_NETDEV, .family = NFPROTO_NETDEV,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.flags = NFT_AF_NEEDS_DEV,
}; };
static int nf_tables_netdev_init_net(struct net *net) static int nf_tables_netdev_init_net(struct net *net)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment