summaryrefslogtreecommitdiff
path: root/net/bridge
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2011-02-11 11:21:57 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-11 11:23:12 -0800
commit946bf5ee3c46f73b5cbd52aab594697b1a132d1f (patch)
treea28a589a294fe25407001d419c8788348633f65b /net/bridge
parent0b150932197b185ad5816932912e648116c7a96a (diff)
downloadlinux-3.10-946bf5ee3c46f73b5cbd52aab594697b1a132d1f.tar.gz
linux-3.10-946bf5ee3c46f73b5cbd52aab594697b1a132d1f.tar.bz2
linux-3.10-946bf5ee3c46f73b5cbd52aab594697b1a132d1f.zip
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>
Diffstat (limited to 'net/bridge')
0 files changed, 0 insertions, 0 deletions