Merge tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / include / linux / in6.h

diff --git a/include/linux/in6.h b/include/linux/in6.h
index 5c83d9e3eb8f1bbc14cb7e906394080fb1760686..cba469ba11a42d9e59a200623739aa6409fb3e7e 100644 (file)
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -142,7 +142,7 @@ struct in6_flowlabel_req {
 /*
  *     IPv6 TLV options.
  */
-#define IPV6_TLV_PAD0          0
+#define IPV6_TLV_PAD1          0
 #define IPV6_TLV_PADN          1
 #define IPV6_TLV_ROUTERALERT   5
 #define IPV6_TLV_JUMBO         194