From ed2b4305e9f6540d6083a277cfdb81c4c7d1a8c9 Mon Sep 17 00:00:00 2001
From: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Date: Wed, 2 Apr 2008 00:00:58 -0700
Subject: [PATCH] --- yaml --- r: 88042 b: refs/heads/master c:
 c6fbfac2e61c9a8617f64b93e8c990b8d864bce5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7cde17211502..c7933e6ee48f 100644
--- 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
index 101e0e70ba27..e11f10eceffc 100644
--- 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 &&