Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / include / linux / in6.h

diff --git a/include/linux/in6.h b/include/linux/in6.h
index bd55c6e46b2ea6bbe72f582eac8cda8c14c0bd60..c4bf46f764bf34bffab67e6de3ec9c8ddee70b0e 100644 (file)
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -221,10 +221,10 @@ struct in6_flowlabel_req {
 #define IPV6_RTHDR             57
 #define IPV6_RECVDSTOPTS       58
 #define IPV6_DSTOPTS           59
-#if 0  /* not yet */
 #define IPV6_RECVPATHMTU       60
 #define IPV6_PATHMTU           61
 #define IPV6_DONTFRAG          62
+#if 0  /* not yet */
 #define IPV6_USE_MIN_MTU       63
 #endif
 
@@ -265,6 +265,9 @@ struct in6_flowlabel_req {
 #define IPV6_PREFER_SRC_CGA            0x0008
 #define IPV6_PREFER_SRC_NONCGA         0x0800
 
+/* RFC5082: Generalized Ttl Security Mechanism */
+#define IPV6_MINHOPCOUNT               73
+
 /*
  * Multicast Routing:
  * see include/linux/mroute6.h.