From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751559AbXCJGU0 (ORCPT ); Sat, 10 Mar 2007 01:20:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752316AbXCJGTh (ORCPT ); Sat, 10 Mar 2007 01:19:37 -0500 Received: from mail.suse.de ([195.135.220.2]:41001 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559AbXCJGTN (ORCPT ); Sat, 10 Mar 2007 01:19:13 -0500 Date: Fri, 9 Mar 2007 22:17:34 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, netfilter-devel@lists.netfilter.org, Patrick McHardy , davem@davemloft.net, Yasuyuki Kozakai Subject: [patch 08/20] ip6_route_me_harder should take into account mark Message-ID: <20070310061734.GI31412@kroah.com> References: <20070310061234.465093436@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="ip6_route_me_harder-should-take-into-account-mark.patch" In-Reply-To: <20070310061603.GA31412@kroah.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Yasuyuki Kozakai [NETFILTER]: ip6_route_me_harder should take into account mark Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman --- net/ipv6/netfilter.c | 1 + 1 file changed, 1 insertion(+) --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c @@ -15,6 +15,7 @@ int ip6_route_me_harder(struct sk_buff * struct dst_entry *dst; struct flowi fl = { .oif = skb->sk ? skb->sk->sk_bound_dev_if : 0, + .mark = skb->mark, .nl_u = { .ip6_u = { .daddr = iph->daddr, --