From d40e4b6a8d21c2a605a2c29c14f2f2e9a9f260e6 Mon Sep 17 00:00:00 2001
From: Jin Dongming <jin.dongming@np.css.fujitsu.com>
Date: Thu, 8 Oct 2009 22:44:47 -0700
Subject: [PATCH] --- yaml --- r: 170493 b: refs/heads/master c:
 e0e6f55d298af03ab88bfe8455b671d29d78f426 h: refs/heads/master i:   170491:
 5f56ac5e578ecd723bdab2fc13b46c23d6c3ec5c v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/ipv6.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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
 };