diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netfilter/nfnetlink_conntrack.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h index fb528e0e3bd9..5c55751c78e4 100644 --- a/include/linux/netfilter/nfnetlink_conntrack.h +++ b/include/linux/netfilter/nfnetlink_conntrack.h | |||
@@ -33,7 +33,6 @@ enum ctattr_type { | |||
33 | CTA_COUNTERS_ORIG, | 33 | CTA_COUNTERS_ORIG, |
34 | CTA_COUNTERS_REPLY, | 34 | CTA_COUNTERS_REPLY, |
35 | CTA_USE, | 35 | CTA_USE, |
36 | CTA_EXPECT, | ||
37 | CTA_ID, | 36 | CTA_ID, |
38 | __CTA_MAX | 37 | __CTA_MAX |
39 | }; | 38 | }; |
@@ -103,10 +102,12 @@ enum ctattr_protonat { | |||
103 | 102 | ||
104 | enum ctattr_expect { | 103 | enum ctattr_expect { |
105 | CTA_EXPECT_UNSPEC, | 104 | CTA_EXPECT_UNSPEC, |
105 | CTA_EXPECT_MASTER, | ||
106 | CTA_EXPECT_TUPLE, | 106 | CTA_EXPECT_TUPLE, |
107 | CTA_EXPECT_MASK, | 107 | CTA_EXPECT_MASK, |
108 | CTA_EXPECT_TIMEOUT, | 108 | CTA_EXPECT_TIMEOUT, |
109 | CTA_EXPECT_ID, | 109 | CTA_EXPECT_ID, |
110 | CTA_EXPECT_HELP_NAME, | ||
110 | __CTA_EXPECT_MAX | 111 | __CTA_EXPECT_MAX |
111 | }; | 112 | }; |
112 | #define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1) | 113 | #define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1) |