diff options
| author | Haibo Huang <hhb@google.com> | 2020-03-10 18:03:41 -0700 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2020-03-10 18:03:41 -0700 |
| commit | cea47bde1b09731e0044c2afbfa2ff05d33a2c46 (patch) | |
| tree | 1c0777907dfd6e9d06206d13932b8c0cdcbc9c91 /include/linux | |
| parent | 0a450fbecad59482317e63dbec14fe752abb4d84 (diff) | |
| parent | dcc537597728c84d47fe9aff32b982c72055a1ad (diff) | |
| download | libnl-cea47bde1b09731e0044c2afbfa2ff05d33a2c46.tar.gz | |
Merge tag 'libnl3_2_25' into HEAD
3.2.25 release
This change reverts all cherry picks to avoid further conflicts when
merging new version.
Change-Id: I58a98f4176f7a8cb3c410e3af6998fd90360dcd1
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/nfnetlink.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h index 1fe29727..4a4efafa 100644 --- a/include/linux/netfilter/nfnetlink.h +++ b/include/linux/netfilter/nfnetlink.h @@ -1,17 +1,7 @@ #ifndef _UAPI_NFNETLINK_H #define _UAPI_NFNETLINK_H #include <linux/types.h> - -#ifndef __KERNEL__ -/* nfnetlink groups: Up to 32 maximum - backwards compatibility for userspace */ -#define NF_NETLINK_CONNTRACK_NEW 0x00000001 -#define NF_NETLINK_CONNTRACK_UPDATE 0x00000002 -#define NF_NETLINK_CONNTRACK_DESTROY 0x00000004 -#define NF_NETLINK_CONNTRACK_EXP_NEW 0x00000008 -#define NF_NETLINK_CONNTRACK_EXP_UPDATE 0x00000010 -#define NF_NETLINK_CONNTRACK_EXP_DESTROY 0x00000020 -#define NF_NETLINK_ACCT_QUOTA 0x00000040 -#endif +#include <linux/netfilter/nfnetlink_compat.h> enum nfnetlink_groups { NFNLGRP_NONE, @@ -28,10 +18,6 @@ enum nfnetlink_groups { #define NFNLGRP_CONNTRACK_EXP_UPDATE NFNLGRP_CONNTRACK_EXP_UPDATE NFNLGRP_CONNTRACK_EXP_DESTROY, #define NFNLGRP_CONNTRACK_EXP_DESTROY NFNLGRP_CONNTRACK_EXP_DESTROY - NFNLGRP_NFTABLES, -#define NFNLGRP_NFTABLES NFNLGRP_NFTABLES - NFNLGRP_ACCT_QUOTA, -#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA __NFNLGRP_MAX, }; #define NFNLGRP_MAX (__NFNLGRP_MAX - 1) |