From patchwork Fri Feb 11 09:30:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Klassert X-Patchwork-Id: 82725 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.180.67]) by ozlabs.org (Postfix) with ESMTP id C5F30B712F for ; Fri, 11 Feb 2011 20:50:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755067Ab1BKJuU (ORCPT ); Fri, 11 Feb 2011 04:50:20 -0500 Received: from a.mx.secunet.com ([195.81.216.161]:50203 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751934Ab1BKJuT (ORCPT ); Fri, 11 Feb 2011 04:50:19 -0500 X-Greylist: delayed 1176 seconds by postgrey-1.27 at vger.kernel.org; Fri, 11 Feb 2011 04:50:19 EST Received: from localhost (alg1 [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id 753871A007C; Fri, 11 Feb 2011 10:29:07 +0100 (CET) X-Virus-Scanned: by secunet Received: from mail-srv1.secumail.de (unknown [10.53.40.200]) by a.mx.secunet.com (Postfix) with ESMTP id 8C7021A007B; Fri, 11 Feb 2011 10:29:06 +0100 (CET) Received: from gauss.dd.secunet.de ([10.182.7.69]) by mail-srv1.secumail.de with Microsoft SMTPSVC(6.0.3790.4675); Fri, 11 Feb 2011 10:30:41 +0100 Received: by gauss.dd.secunet.de (Postfix, from userid 1000) id AB1FF5C1768; Fri, 11 Feb 2011 10:30:40 +0100 (CET) Date: Fri, 11 Feb 2011 10:30:40 +0100 From: Steffen Klassert To: David Miller Cc: Changli Gao , netdev@vger.kernel.org Subject: [PATCH] ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit Message-ID: <20110211093040.GB29583@secunet.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-OriginalArrivalTime: 11 Feb 2011 09:30:41.0278 (UTC) FILETIME=[5988E1E0:01CBC9CE] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 5811662b15db018c740c57d037523683fd3e6123 accidentally removed the setting of IPPROTO_GRE from the struct flowi in ipgre_tunnel_xmit. This patch restores it. Signed-off-by: Steffen Klassert Acked-by: Changli Gao --- net/ipv4/ip_gre.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index eb68a0e..6613edf 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -775,6 +775,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev .fl4_dst = dst, .fl4_src = tiph->saddr, .fl4_tos = RT_TOS(tos), + .proto = IPPROTO_GRE, .fl_gre_key = tunnel->parms.o_key }; if (ip_route_output_key(dev_net(dev), &rt, &fl)) {