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: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 536aaec96a07dcc2629c3c1a83d8804add5527a0..9a85893a5e30af49343ef611261ad2fe21d1e565 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -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 *);

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 93e4e67e4b4dcc1323ba97c713cb3e329642d850..a1b73d39dd7163b4f7c9bb08c6fdfd8a5b50cf58 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -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]) {

diff --git a/net/netfilter/nf_tables_netdev.c b/net/netfilter/nf_tables_netdev.c
index 3da3dc7de9455357c408d47f4fe7004db29fe188..c7f671daa7d007c520173e5bd33207d3dd27d6b1 100644 (file)
--- a/net/netfilter/nf_tables_netdev.c
+++ b/net/netfilter/nf_tables_netdev.c
@@ -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)