git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt
[safe/jmp/linux-2.6]
/
include
/
linux
/
in6.h
diff --git
a/include/linux/in6.h
b/include/linux/in6.h
index
9be6a47
..
f28621f
100644
(file)
--- a/
include/linux/in6.h
+++ b/
include/linux/in6.h
@@
-225,7
+225,7
@@
struct in6_flowlabel_req
#endif
/*
#endif
/*
- * Netfilter
+ * Netfilter
(1)
*
* Following socket options are used in ip6_tables;
* see include/linux/netfilter_ipv6/ip6_tables.h.
*
* Following socket options are used in ip6_tables;
* see include/linux/netfilter_ipv6/ip6_tables.h.
@@
-240,4
+240,14
@@
struct in6_flowlabel_req
#define IPV6_RECVTCLASS 66
#define IPV6_TCLASS 67
#define IPV6_RECVTCLASS 66
#define IPV6_TCLASS 67
+/*
+ * Netfilter (2)
+ *
+ * Following socket options are used in ip6_tables;
+ * see include/linux/netfilter_ipv6/ip6_tables.h.
+ *
+ * IP6T_SO_GET_REVISION_MATCH 68
+ * IP6T_SO_GET_REVISION_TARGET 69
+ */
+
#endif
#endif