diff --git a/[refs] b/[refs]
index da655b64fc6a..46b98bf65825 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3758bf25db8caeec667e4e56e030da0ec3060529
+refs/heads/master: e0e6f55d298af03ab88bfe8455b671d29d78f426
diff --git a/trunk/include/linux/ipv6.h b/trunk/include/linux/ipv6.h
index ae74ede1abe7..56404251248c 100644
--- a/trunk/include/linux/ipv6.h
+++ b/trunk/include/linux/ipv6.h
@@ -208,6 +208,7 @@ enum {
 	DEVCONF_MC_FORWARDING,
 	DEVCONF_DISABLE_IPV6,
 	DEVCONF_ACCEPT_DAD,
+	DEVCONF_FORCE_TLLAO,
 	DEVCONF_MAX
 };