From 8499ecf3813d745c7ba75a7cb72035ca6865bf7f Mon Sep 17 00:00:00 2001
From: Brian Haley <brian.haley@hp.com>
Date: Wed, 13 Aug 2008 01:58:57 -0700
Subject: [PATCH] --- yaml --- r: 108372 b: refs/heads/master c:
 5e0115e500fe9dd2ca11e6f92db9123204f1327a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1035c60254db..a24f84c564de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 987c402ac31988f7ecdb38b657bcfeea5831d479
+refs/heads/master: 5e0115e500fe9dd2ca11e6f92db9123204f1327a
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 5a3e87e4b18f..41b165ffb369 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -2187,8 +2187,9 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,
 #endif
 			NLA_PUT_U32(skb, RTA_IIF, iif);
 	} else if (dst) {
+		struct inet6_dev *idev = ip6_dst_idev(&rt->u.dst);
 		struct in6_addr saddr_buf;
-		if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+		if (ipv6_dev_get_saddr(idev ? idev->dev : NULL,
 				       dst, 0, &saddr_buf) == 0)
 			NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
 	}