From cb496916192c64e9086fe4a9b419990cb872cd61 Mon Sep 17 00:00:00 2001
From: Yang Hongyang <yanghy@cn.fujitsu.com>
Date: Tue, 16 Dec 2008 02:08:29 -0800
Subject: [PATCH] --- yaml --- r: 122733 b: refs/heads/master c:
 9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b h: refs/heads/master i:   122731:
 ad5bf1937d2bb16bd0c80e08fce5738597ff23e3 v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv6/udp.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3f5a887af904..588f8b04950c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f250dcdac111a8369220b8e192eae6c56dc1098a
+refs/heads/master: 9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b
diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c
index 38390dd19636..84b1a296eecb 100644
--- a/trunk/net/ipv6/udp.c
+++ b/trunk/net/ipv6/udp.c
@@ -793,6 +793,9 @@ int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk,
 	if (!fl.oif)
 		fl.oif = sk->sk_bound_dev_if;
 
+	if (!fl.oif)
+		fl.oif = np->sticky_pktinfo.ipi6_ifindex;
+
 	if (msg->msg_controllen) {
 		opt = &opt_space;
 		memset(opt, 0, sizeof(struct ipv6_txoptions));