netfilter: nftables: statify nft_parse_register()

Origin: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit?id=f19a4818a92ae0d998df221f554be33c3224eee9

commit 08a01c11a5bb3de9b0a9c9b2685867e50eda9910 upstream.

This function is not used anymore by any extension, statify it.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name netfilter-nftables-statify-nft_parse_register.patch

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 564fbe0c865fdc59d994578314143d687154e919..030237f3d82a6627fab3e64d6e69b07d15b92f2e 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -205,7 +205,6 @@ static inline enum nft_registers nft_type_to_reg(enum nft_data_types type)
 }
 
 int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest);
-unsigned int nft_parse_register(const struct nlattr *attr);
 int nft_dump_register(struct sk_buff *skb, unsigned int attr, unsigned int reg);
 
 int nft_parse_register_load(const struct nlattr *attr, u8 *sreg, u32 len);

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 24b51712633c3ca8b233ef2856c64a98e47dba1d..f2c725b0c01d5179ec45b506c79ece50a473b32c 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -8495,7 +8495,7 @@ EXPORT_SYMBOL_GPL(nft_parse_u32_check);
  *     Registers used to be 128 bit wide, these register numbers will be
  *     mapped to the corresponding 32 bit register numbers.
  */
-unsigned int nft_parse_register(const struct nlattr *attr)
+static unsigned int nft_parse_register(const struct nlattr *attr)
 {
        unsigned int reg;
 
@@ -8507,7 +8507,6 @@ unsigned int nft_parse_register(const struct nlattr *attr)
                return reg + NFT_REG_SIZE / NFT_REG32_SIZE - NFT_REG32_00;
        }
 }
-EXPORT_SYMBOL_GPL(nft_parse_register);
 
 /**
  *     nft_dump_register - dump a register value to a netlink attribute