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

Commit 0ed6389c authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

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: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a6c46d9b

net/netfilter/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -481,13 +481,13 @@ config NFT_CT 
	  This option adds the "meta" expression that you can use to match

	  This option adds the "meta" expression that you can use to match

	  connection tracking information such as the flow state.

	  connection tracking information such as the flow state.





config NFT_RBTREE

config NFT_SET_RBTREE

	tristate "Netfilter nf_tables rbtree set module"

	tristate "Netfilter nf_tables rbtree set module"

	help

	help

	  This option adds the "rbtree" set type (Red Black tree) that is used

	  This option adds the "rbtree" set type (Red Black tree) that is used

	  to build interval-based sets.

	  to build interval-based sets.





config NFT_HASH

config NFT_SET_HASH

	tristate "Netfilter nf_tables hash set module"

	tristate "Netfilter nf_tables hash set module"

	help

	help

	  This option adds the "hash" set type that is used to build one-way

	  This option adds the "hash" set type that is used to build one-way

net/netfilter/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -86,8 +86,8 @@ obj-$(CONFIG_NFT_NAT) += nft_nat.o 
obj-$(CONFIG_NFT_QUEUE)		+= nft_queue.o

obj-$(CONFIG_NFT_QUEUE)		+= nft_queue.o

obj-$(CONFIG_NFT_REJECT) 	+= nft_reject.o

obj-$(CONFIG_NFT_REJECT) 	+= nft_reject.o

obj-$(CONFIG_NFT_REJECT_INET)	+= nft_reject_inet.o

obj-$(CONFIG_NFT_REJECT_INET)	+= nft_reject_inet.o

obj-$(CONFIG_NFT_RBTREE)	+= nft_rbtree.o

obj-$(CONFIG_NFT_SET_RBTREE)	+= nft_set_rbtree.o

obj-$(CONFIG_NFT_HASH)		+= nft_hash.o

obj-$(CONFIG_NFT_SET_HASH)	+= nft_set_hash.o

obj-$(CONFIG_NFT_COUNTER)	+= nft_counter.o

obj-$(CONFIG_NFT_COUNTER)	+= nft_counter.o

obj-$(CONFIG_NFT_LOG)		+= nft_log.o

obj-$(CONFIG_NFT_LOG)		+= nft_log.o

obj-$(CONFIG_NFT_MASQ)		+= nft_masq.o

obj-$(CONFIG_NFT_MASQ)		+= nft_masq.o

net/netfilter/nft_hash.c→net/netfilter/nft_set_hash.c

+0 −0

File moved.

View file