From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Wed, 21 Apr 2010 23:25:30 +0000 (-0700)
Subject: xfrm6: ensure to use the same dev when building a bundle
X-Git-Tag: v2.6.34-rc6~30^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc8e4b954e463716a57d8113dd50ae9d47b682a7;p=profile%2Fcommon%2Fkernel-common.git

xfrm6: ensure to use the same dev when building a bundle

When building a bundle, we set dst.dev and rt6.rt6i_idev.
We must ensure to set the same device for both fields.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index ae18165..00bf7c9 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/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;