History

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.

Phil Sutter committed 1 year ago

Commit 36a686c1 parent 6ac86ac6 files · +0 −79Browse files

Showing the changes to include/uapi/linux (2 of 6 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/netfilter/nf_tables.h +0 −10
  2. include/uapi/linux/netfilter/nfnetlink.h +0 −2
include/uapi/linux/netfilter/nf_tables.h+0−10
@@ -142,8 +142,6 @@ enum nf_tables_msg_types { · 141 unmodified lines
142 NFT_MSG_DESTROYOBJ,142 NFT_MSG_DESTROYOBJ,
143 NFT_MSG_DESTROYFLOWTABLE,143 NFT_MSG_DESTROYFLOWTABLE,
144 NFT_MSG_GETSETELEM_RESET,144 NFT_MSG_GETSETELEM_RESET,
145 NFT_MSG_NEWDEV,
146 NFT_MSG_DELDEV,
147 NFT_MSG_MAX,145 NFT_MSG_MAX,
148};146};
149 147
@@ -1786,18 +1784,10 @@ enum nft_synproxy_attributes { · 1636 unmodified lines
1786 * enum nft_device_attributes - nf_tables device netlink attributes1784 * enum nft_device_attributes - nf_tables device netlink attributes
1787 *1785 *
1788 * @NFTA_DEVICE_NAME: name of this device (NLA_STRING)1786 * @NFTA_DEVICE_NAME: name of this device (NLA_STRING)
1789 * @NFTA_DEVICE_TABLE: table containing the flowtable or chain hooking into the device (NLA_STRING)
1790 * @NFTA_DEVICE_FLOWTABLE: flowtable hooking into the device (NLA_STRING)
1791 * @NFTA_DEVICE_CHAIN: chain hooking into the device (NLA_STRING)
1792 * @NFTA_DEVICE_SPEC: hook spec matching the device (NLA_STRING)
1793 */1787 */
1794enum nft_devices_attributes {1788enum nft_devices_attributes {
1795 NFTA_DEVICE_UNSPEC,1789 NFTA_DEVICE_UNSPEC,
1796 NFTA_DEVICE_NAME,1790 NFTA_DEVICE_NAME,
1797 NFTA_DEVICE_TABLE,
1798 NFTA_DEVICE_FLOWTABLE,
1799 NFTA_DEVICE_CHAIN,
1800 NFTA_DEVICE_SPEC,
1801 __NFTA_DEVICE_MAX1791 __NFTA_DEVICE_MAX
1802};1792};
1803#define NFTA_DEVICE_MAX (__NFTA_DEVICE_MAX - 1)1793#define NFTA_DEVICE_MAX (__NFTA_DEVICE_MAX - 1)
include/uapi/linux/netfilter/nfnetlink.h+0−2
@@ -25,8 +25,6 @@ enum nfnetlink_groups { · 24 unmodified lines
25#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA25#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA
26 NFNLGRP_NFTRACE,26 NFNLGRP_NFTRACE,
27#define NFNLGRP_NFTRACE NFNLGRP_NFTRACE27#define NFNLGRP_NFTRACE NFNLGRP_NFTRACE
28 NFNLGRP_NFT_DEV,
29#define NFNLGRP_NFT_DEV NFNLGRP_NFT_DEV
30 __NFNLGRP_MAX,28 __NFNLGRP_MAX,
31};29};
32#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)30#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)