git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
linux
/
netfilter_ipv6
/
ip6t_LOG.h
diff --git
a/include/linux/netfilter_ipv6/ip6t_LOG.h
b/include/linux/netfilter_ipv6/ip6t_LOG.h
index
0646a10
..
0d0119b
100644
(file)
--- a/
include/linux/netfilter_ipv6/ip6t_LOG.h
+++ b/
include/linux/netfilter_ipv6/ip6t_LOG.h
@@
-1,10
+1,13
@@
#ifndef _IP6T_LOG_H
#define _IP6T_LOG_H
#ifndef _IP6T_LOG_H
#define _IP6T_LOG_H
+/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
#define IP6T_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
#define IP6T_LOG_TCPOPT 0x02 /* Log TCP options */
#define IP6T_LOG_IPOPT 0x04 /* Log IP options */
#define IP6T_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
#define IP6T_LOG_TCPOPT 0x02 /* Log TCP options */
#define IP6T_LOG_IPOPT 0x04 /* Log IP options */
-#define IP6T_LOG_MASK 0x07
+#define IP6T_LOG_UID 0x08 /* Log UID owning local socket */
+#define IP6T_LOG_NFLOG 0x10 /* Unsupported, don't use */
+#define IP6T_LOG_MASK 0x1f
struct ip6t_log_info {
unsigned char level;
struct ip6t_log_info {
unsigned char level;