projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[linux-2.6-microblaze.git]
/
include
/
uapi
/
linux
/
netfilter
/
nf_tables.h
diff --git
a/include/uapi/linux/netfilter/nf_tables.h
b/include/uapi/linux/netfilter/nf_tables.h
index
579974b
..
7de4f1b
100644
(file)
--- a/
include/uapi/linux/netfilter/nf_tables.h
+++ b/
include/uapi/linux/netfilter/nf_tables.h
@@
-1635,8
+1635,8
@@
enum nft_ng_attributes {
NFTA_NG_MODULUS,
NFTA_NG_TYPE,
NFTA_NG_OFFSET,
- NFTA_NG_SET_NAME,
- NFTA_NG_SET_ID,
+ NFTA_NG_SET_NAME,
/* deprecated */
+ NFTA_NG_SET_ID,
/* deprecated */
__NFTA_NG_MAX
};
#define NFTA_NG_MAX (__NFTA_NG_MAX - 1)