Auto merge with /home/aegl/GIT/linus

[linux-2.6] / include / linux / in6.h

diff --git a/include/linux/in6.h b/include/linux/in6.h
index f8256c582845399c47f2818e2b9900115e5aa528..dcf5720ffcbb3419c524140bfbc02945c53f3e47 100644 (file)
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -156,7 +156,7 @@ struct in6_flowlabel_req
 #define IPV6_CHECKSUM          7
 #define IPV6_HOPLIMIT          8
 #define IPV6_NEXTHOP           9
-#define IPV6_AUTHHDR           10
+#define IPV6_AUTHHDR           10      /* obsolete */
 #define IPV6_FLOWINFO          11
 
 #define IPV6_UNICAST_HOPS      16