Revert "netfilter: nf_tables: Add notifications for hook changes"
Subsystems (2)
Phil Sutter
reviewerPATCH 1/1 Revert "netfilter: nf_tables: Add notifications for hook changes"
This reverts commit 465b9ee0ee7bc268d7f261356afd6c4262e48d82.
Such notifications fit better into core or nfnetlink_hook code, following the NFNL_MSG_HOOK_GET message format.
Signed-off-by Phil Sutter <[email protected]>
--- include/net/netfilter/nf_tables.h | 5 -- include/uapi/linux/netfilter/nf_tables.h | 10 ---- include/uapi/linux/netfilter/nfnetlink.h | 2 - net/netfilter/nf_tables_api.c | 59 ------------------------ net/netfilter/nfnetlink.c | 1 - net/netfilter/nft_chain_filter.c | 2 - 6 files changed, 79 deletions(-)
include/net/netfilter/nf_tables.h +0 -5
@@ -1142,11 +1142,6 @@ int nft_set_catchall_validate(const struct nft_ctx *ctx, struct nft_set *set);int nf_tables_bind_chain (const struct nft_ctx *ctx,struct nft_chain *chain);void nf_tables_unbind_chain (const struct nft_ctx *ctx,struct nft_chain *chain); -struct nft_hook ; -void nf_tables_chain_device_notify (const struct nft_chain *chain, -const struct nft_hook *hook, -const struct net_device *dev,int event); -enum nft_chain_types {NFT_CHAIN_T_DEFAULT =0 ,NFT_CHAIN_T_ROUTE ,
include/uapi/linux/netfilter/nf_tables.h +0 -10
@@ -142,8 +142,6 @@ enum nf_tables_msg_types {NFT_MSG_DESTROYOBJ ,NFT_MSG_DESTROYFLOWTABLE ,NFT_MSG_GETSETELEM_RESET , -NFT_MSG_NEWDEV , -NFT_MSG_DELDEV , NFT_MSG_MAX, };
@@ -1786,18 +1784,10 @@ enum nft_synproxy_attributes {* enum nft_device_attributes - nf_tables device netlink attributes * * @NFTA_DEVICE_NAME: name of this device (NLA_STRING) -* @NFTA_DEVICE_TABLE: table containing the flowtable or chain hooking into the device (NLA_STRING) -* @NFTA_DEVICE_FLOWTABLE: flowtable hooking into the device (NLA_STRING) -* @NFTA_DEVICE_CHAIN: chain hooking into the device (NLA_STRING) -* @NFTA_DEVICE_SPEC: hook spec matching the device (NLA_STRING) */ enum nft_devices_attributes {NFTA_DEVICE_UNSPEC ,NFTA_DEVICE_NAME , -NFTA_DEVICE_TABLE , -NFTA_DEVICE_FLOWTABLE , -NFTA_DEVICE_CHAIN , -NFTA_DEVICE_SPEC , __NFTA_DEVICE_MAX };#define NFTA_DEVICE_MAX (__NFTA_DEVICE_MAX - 1)
include/uapi/linux/netfilter/nfnetlink.h +0 -2
@@ -25,8 +25,6 @@ enum nfnetlink_groups {#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA NFNLGRP_NFTRACE,#define NFNLGRP_NFTRACE NFNLGRP_NFTRACE - NFNLGRP_NFT_DEV, -#define NFNLGRP_NFT_DEV NFNLGRP_NFT_DEV __NFNLGRP_MAX, };#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)
net/netfilter/nf_tables_api.c +0 -59
71 lines not on this page · raw message
net/netfilter/nfnetlink.c +0 -1
@@ -86,7 +86,6 @@ static const int nfnl_group2type[NFNLGRP_MAX+1] = { [NFNLGRP_NFTABLES] = NFNL_SUBSYS_NFTABLES, [NFNLGRP_ACCT_QUOTA] = NFNL_SUBSYS_ACCT, [NFNLGRP_NFTRACE] = NFNL_SUBSYS_NFTABLES, - [NFNLGRP_NFT_DEV] = NFNL_SUBSYS_NFTABLES, };static struct nfnl_net *nfnl_pernet (struct net *net)
net/netfilter/nft_chain_filter.c +0 -2
@@ -363,8 +363,6 @@ static int nft_netdev_event(unsigned long event, struct net_device *dev,list_add_tail_rcu (&ops->list, &hook->ops_list);break ; } -nf_tables_chain_device_notify (&basechain->chain, - hook, dev, event);break ; }return 0 ;
Signature · 1 line
2.49.0
Quoted 4 lines · Phil Sutter
This reverts commit
465b9ee0ee7bc268d7f261356afd6c4262e48d82.Such notifications fit better into core or
nfnetlink_hookcode, following theNFNL_MSG_HOOK_GETmessage format.
Applied to nf.git, thanks