projects / linux-flexiantxendom0-natty.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 0b15093) | patch
ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit
authorSteffen Klassert <steffen.klassert@secunet.com>
Fri, 11 Feb 2011 19:21:57 +0000 (11:21 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Feb 2011 19:23:12 +0000 (11:23 -0800)
commit946bf5ee3c46f73b5cbd52aab594697b1a132d1f
treea28a589a294fe25407001d419c8788348633f65btree | snapshot
parent0b150932197b185ad5816932912e648116c7a96acommit | diff
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>
net/ipv4/ip_gre.c diff | blob | history
Port of xen3.3 xenlinux code to Ubuntu Natty kernel