From patchwork Tue Dec 9 07:12:59 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 12899 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 117FEDDF08 for ; Tue, 9 Dec 2008 18:11:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751990AbYLIHLa (ORCPT ); Tue, 9 Dec 2008 02:11:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751988AbYLIHL3 (ORCPT ); Tue, 9 Dec 2008 02:11:29 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:58381 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751949AbYLIHL2 (ORCPT ); Tue, 9 Dec 2008 02:11:28 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 567F5170091; Tue, 9 Dec 2008 15:16:39 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id mB97Gc3G028816; Tue, 9 Dec 2008 15:16:38 +0800 Received: from localhost.localdomain (unknown [10.167.141.200]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 342A8D436E; Tue, 9 Dec 2008 15:15:46 +0800 (CST) Message-ID: <493E1A7B.9070208@cn.fujitsu.com> Date: Tue, 09 Dec 2008 15:12:59 +0800 From: Yang Hongyang User-Agent: Thunderbird 2.0.0.17 (X11/20081009) MIME-Version: 1.0 To: netdev@vger.kernel.org, "David S. Miller" Subject: [RFC][PATCH 3/3]ipv6:fix the outgoing interface selection order in udpv6_sendmsg() Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 1.When no interface is specified in an IPV6_PKTINFO ancillary data item, the interface specified in an IPV6_PKTINFO sticky optionis is used. RFC3542: 6.7. Summary of Outgoing Interface Selection This document and [RFC-3493] specify various methods that affect the selection of the packet's outgoing interface. This subsection summarizes the ordering among those in order to ensure deterministic behavior. For a given outgoing packet on a given socket, the outgoing interface is determined in the following order: 1. if an interface is specified in an IPV6_PKTINFO ancillary data item, the interface is used. 2. otherwise, if an interface is specified in an IPV6_PKTINFO sticky option, the interface is used. Signed-off-by: Yang Hongyang --- net/ipv6/udp.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 8b48512..addd856 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -761,6 +761,9 @@ do_udp_sendmsg: } if (!fl.oif) + fl.oif = np->sticky_pktinfo.ipi6_ifindex; + + if (!fl.oif) fl.oif = sk->sk_bound_dev_if; if (msg->msg_controllen) {