diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2011-02-11 11:21:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-11 11:23:12 -0800 |
| commit | 946bf5ee3c46f73b5cbd52aab594697b1a132d1f (patch) | |
| tree | a28a589a294fe25407001d419c8788348633f65b /net | |
| parent | 0b150932197b185ad5816932912e648116c7a96a (diff) | |
| download | linux-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')
| -rw-r--r-- | 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 eb68a0e34e4..6613edfac28 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)) { |