From 64191edb230758d88586869c9f8d7c92f3a35981 Mon Sep 17 00:00:00 2001
From: Brian Haley <brian.haley@hp.com>
Date: Fri, 28 May 2010 23:02:35 -0700
Subject: [PATCH] --- yaml --- r: 199457 b: refs/heads/master c:
 6057fd78a8dcce6269f029b967051d5a2e9b0895 h: refs/heads/master i:   199455:
 8eceaf53c4290af1f3794869cb76a7d76dd6f558 v: v3

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

diff --git a/[refs] b/[refs]
index f5bff5c11a95..1971226d0e08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5e5cf4c71508ed38e921b31b438b8b349409f2a
+refs/heads/master: 6057fd78a8dcce6269f029b967051d5a2e9b0895
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 294cbe8b0725..252d76199c41 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -814,7 +814,7 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk,
 {
 	int flags = 0;
 
-	if (fl->oif || rt6_need_strict(&fl->fl6_dst))
+	if ((sk && sk->sk_bound_dev_if) || rt6_need_strict(&fl->fl6_dst))
 		flags |= RT6_LOOKUP_F_IFACE;
 
 	if (!ipv6_addr_any(&fl->fl6_src))