From 7cfc5f35e0cc1bb5e4b40aa0fd579b60da79a7d4 Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Wed, 21 Apr 2010 16:25:30 -0700
Subject: [PATCH] --- yaml --- r: 190231 b: refs/heads/master c:
 bc8e4b954e463716a57d8113dd50ae9d47b682a7 h: refs/heads/master i:   190229:
 b821a7b58dabc89b96933857e98044d6ee816c52   190227:
 ae236351688255e662b60382133a965cb17b1562   190223:
 018cbe55b84d777ae06eb4a454d0a13af643ff5d v: v3

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

diff --git a/[refs] b/[refs]
index 8df147f220de..57473602a142 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c0b28b1ee90261a0a27194e6684dd2837785064
+refs/heads/master: bc8e4b954e463716a57d8113dd50ae9d47b682a7
diff --git a/trunk/net/ipv6/xfrm6_policy.c b/trunk/net/ipv6/xfrm6_policy.c
index ae181651c75a..00bf7c962b7e 100644
--- a/trunk/net/ipv6/xfrm6_policy.c
+++ b/trunk/net/ipv6/xfrm6_policy.c
@@ -124,7 +124,7 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
 	xdst->u.dst.dev = dev;
 	dev_hold(dev);
 
-	xdst->u.rt6.rt6i_idev = in6_dev_get(rt->u.dst.dev);
+	xdst->u.rt6.rt6i_idev = in6_dev_get(dev);
 	if (!xdst->u.rt6.rt6i_idev)
 		return -ENODEV;