From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Fri, 11 Feb 2011 19:21:57 +0000 (-0800)
Subject: ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit
X-Git-Tag: v2.6.38-rc6~20^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=946bf5ee3c46f73b5cbd52aab594697b1a132d1f;p=pandora-kernel.git

ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit

Commit 5811662b15db018c740c57d037523683fd3e6123 ("net: use the macros
defined for the members of flowi") accidentally removed the setting of
IPPROTO_GRE from the struct flowi in ipgre_tunnel_xmit. This patch
restores it.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed