From 996eb0901d52bacc12b3e0dd9cbba7ee4edcc616 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Sun, 16 Sep 2007 14:48:21 -0700
Subject: [PATCH] --- yaml --- r: 64991 b: refs/heads/master c:
 6ae5f983cf8de769214d2d9e8a783c881eccd4cd h: refs/heads/master i:   64989:
 f6210af20e0648c0caa344ab0d2ea2e4316f8582   64987:
 2f6b58546b6155c5099df85bcf3a8f85e5ce5516   64983:
 c342b4ecdf001a934dd88b2462dfe869128548a9   64975:
 5048947cb393efc5e5404abccd09cefe939db317   64959:
 f6de346165e91bc3c6c31c2425ef0e6e558787c9 v: v3

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

diff --git a/[refs] b/[refs]
index 94e30cf8ae38..6a880a9ddf07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a0c6c980d209827e5d69017fa736f107a744d1d
+refs/heads/master: 6ae5f983cf8de769214d2d9e8a783c881eccd4cd
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 91ef3be5abad..45b4c82148a0 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -1021,7 +1021,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
 				hiscore.rule++;
 			}
 			if (ipv6_saddr_preferred(score.addr_type) ||
-			   (((ifa_result->flags &
+			   (((ifa->flags &
 			    (IFA_F_DEPRECATED|IFA_F_OPTIMISTIC)) == 0))) {
 				score.attrs |= IPV6_SADDR_SCORE_PREFERRED;
 				if (!(hiscore.attrs & IPV6_SADDR_SCORE_PREFERRED)) {