---

yaml --- r: 88042 b: refs/heads/master c: c6fbfac h: refs/heads/master v: v3
git-mirror · Apr 2, 2008 · ed2b430 · ed2b430
1 parent b8a071d
commit ed2b430
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1905f6c736cb618e07eca0c96e60e3c024023428
+refs/heads/master: c6fbfac2e61c9a8617f64b93e8c990b8d864bce5
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
@@ -1831,6 +1831,9 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len)
 				 * lifetimes of an existing temporary address
 				 * when processing a Prefix Information Option.
 				 */
+				if (ifp != ift->ifpub)
+					continue;
+
 				spin_lock(&ift->lock);
 				flags = ift->flags;
 				if (ift->valid_lft > valid_lft &&