From 94729859d682aec3d89c0866ba65083634d527e2 Mon Sep 17 00:00:00 2001
From: Cosmin Ratiu <cratiu@ixiacom.com>
Date: Fri, 9 Oct 2009 03:11:14 +0000
Subject: [PATCH] --- yaml --- r: 170671 b: refs/heads/master c:
 c3faca053d0a9c877597935b434150b422dbc6fb h: refs/heads/master i:   170669:
 b2602a7247d64dd12fe56473a24f04275275364f   170667:
 684d33835258388a9117a776578a7fce25c146ed   170663:
 50dbe970bd7385e297935b784ba18b9e74e9c575   170655:
 f95893d4086cf8831c4a8c6af4c7b500495ef155 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/addrconf.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 49060e5bbd99..b511e1034388 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38fc0026da255aa328c3730a1c4d28b4e11e6a2b
+refs/heads/master: c3faca053d0a9c877597935b434150b422dbc6fb
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index bdcee6981c60..918648409612 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -3708,6 +3708,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
 #endif
 	array[DEVCONF_DISABLE_IPV6] = cnf->disable_ipv6;
 	array[DEVCONF_ACCEPT_DAD] = cnf->accept_dad;
+	array[DEVCONF_FORCE_TLLAO] = cnf->force_tllao;
 }
 
 static inline size_t inet6_if_nlmsg_size(void)