diff options
| author | Pablo Neira Ayuso | 2016-08-09 16:11:46 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2016-08-12 00:44:37 +0200 |
| commit | 0ed6389c483dc77cdbdd48de0ca7ce41723dd667 (patch) | |
| tree | 359c77fe53ce37ca8c5fe569da44d93079c6e767 /net/netfilter | |
| parent | ipvs: use nf_ct_kill helper (diff) | |
| download | kernel-qcow2-linux-0ed6389c483dc77cdbdd48de0ca7ce41723dd667.tar.gz kernel-qcow2-linux-0ed6389c483dc77cdbdd48de0ca7ce41723dd667.tar.xz kernel-qcow2-linux-0ed6389c483dc77cdbdd48de0ca7ce41723dd667.zip | |
netfilter: nf_tables: rename set implementations
Use nft_set_* prefix for backend set implementations, thus we can use
nft_hash for the new hash expression.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/Kconfig | 4 | ||||
| -rw-r--r-- | net/netfilter/Makefile | 4 | ||||
| -rw-r--r-- | net/netfilter/nft_set_hash.c (renamed from net/netfilter/nft_hash.c) | 0 | ||||
| -rw-r--r-- | net/netfilter/nft_set_rbtree.c (renamed from net/netfilter/nft_rbtree.c) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 9266ceebd112..e5740e108a0b 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -481,13 +481,13 @@ config NFT_CT This option adds the "meta" expression that you can use to match connection tracking information such as the flow state. -config NFT_RBTREE +config NFT_SET_RBTREE tristate "Netfilter nf_tables rbtree set module" help This option adds the "rbtree" set type (Red Black tree) that is used to build interval-based sets. -config NFT_HASH +config NFT_SET_HASH tristate "Netfilter nf_tables hash set module" help This option adds the "hash" set type that is used to build one-way diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index 69134541d65b..101fb859203c 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -86,8 +86,8 @@ obj-$(CONFIG_NFT_NAT) += nft_nat.o obj-$(CONFIG_NFT_QUEUE) += nft_queue.o obj-$(CONFIG_NFT_REJECT) += nft_reject.o obj-$(CONFIG_NFT_REJECT_INET) += nft_reject_inet.o -obj-$(CONFIG_NFT_RBTREE) += nft_rbtree.o -obj-$(CONFIG_NFT_HASH) += nft_hash.o +obj-$(CONFIG_NFT_SET_RBTREE) += nft_set_rbtree.o +obj-$(CONFIG_NFT_SET_HASH) += nft_set_hash.o obj-$(CONFIG_NFT_COUNTER) += nft_counter.o obj-$(CONFIG_NFT_LOG) += nft_log.o obj-$(CONFIG_NFT_MASQ) += nft_masq.o diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_set_hash.c index 564fa7929ed5..564fa7929ed5 100644 --- a/net/netfilter/nft_hash.c +++ b/net/netfilter/nft_set_hash.c diff --git a/net/netfilter/nft_rbtree.c b/net/netfilter/nft_set_rbtree.c index 6473936d05c6..6473936d05c6 100644 --- a/net/netfilter/nft_rbtree.c +++ b/net/netfilter/nft_set_rbtree.c |