From dd50236ba5a602061bafe0c0c84f87e560dafad2 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 15 Jul 2010 11:27:41 +0200
Subject: [PATCH] --- yaml --- r: 203967 b: refs/heads/master c:
 cca5cf91c789f3301cc2541a79c323c53be5a8e1 h: refs/heads/master i:   203965:
 ceba57aff5673f9c1b9ea48323b4bbdb34285f2d   203963:
 cc3bbca8c24420d970320256b4232c5de01647ff   203959:
 4e5639d477c90779e31f9e04777a020d19229f08   203951:
 8296ebf6862e60fda3f1f0d30d4dc40e026ec1df   203935:
 1f05233506c4f60763dc1530bfbfa21de9c7a9d8   203903:
 922ad8bf5638d6a95853edb1079a2bd241e7ac5d v: v3

---
 [refs]                                        | 2 +-
 trunk/include/linux/netfilter/nfnetlink_log.h | 2 +-
 trunk/include/net/netfilter/nfnetlink_log.h   | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 82d69eb8c4b1..d5c2ce746c61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 116e1f1b09dffe0ff8ebab73501324dca7bbbe5e
+refs/heads/master: cca5cf91c789f3301cc2541a79c323c53be5a8e1
diff --git a/trunk/include/linux/netfilter/nfnetlink_log.h b/trunk/include/linux/netfilter/nfnetlink_log.h
index 1d0b84aa1d42..ea9b8d380527 100644
--- a/trunk/include/linux/netfilter/nfnetlink_log.h
+++ b/trunk/include/linux/netfilter/nfnetlink_log.h
@@ -89,7 +89,7 @@ enum nfulnl_attr_config {
 #define NFULNL_COPY_NONE	0x00
 #define NFULNL_COPY_META	0x01
 #define NFULNL_COPY_PACKET	0x02
-#define NFULNL_COPY_DISABLED	0x03
+/* 0xff is reserved, don't use it for new copy modes. */
 
 #define NFULNL_CFG_F_SEQ	0x0001
 #define NFULNL_CFG_F_SEQ_GLOBAL	0x0002
diff --git a/trunk/include/net/netfilter/nfnetlink_log.h b/trunk/include/net/netfilter/nfnetlink_log.h
index b0569ff0775e..e2dec42c2db2 100644
--- a/trunk/include/net/netfilter/nfnetlink_log.h
+++ b/trunk/include/net/netfilter/nfnetlink_log.h
@@ -10,5 +10,7 @@ nfulnl_log_packet(u_int8_t pf,
 		  const struct nf_loginfo *li_user,
 		  const char *prefix);
 
+#define NFULNL_COPY_DISABLED    0xff
+
 #endif /* _KER_NFNETLINK_LOG_H */