diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:22 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:25 +0100 |
commit | 888a8a3e9d79cbb9d83e53955f684998248580ec (patch) | |
tree | 3dbf548438c77d89c8696a9a79c4129cdc2f3d3e /net/ipv4/ip_gre.c | |
parent | cfff2d909cbdaf8c467bd321aa0502a548ec8f7e (diff) | |
parent | b06b3d49699a52e8f9ca056c4f96e81b1987d78e (diff) | |
download | talos-obmc-linux-888a8a3e9d79cbb9d83e53955f684998248580ec.tar.gz talos-obmc-linux-888a8a3e9d79cbb9d83e53955f684998248580ec.zip |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up updates before queueing up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ipv4/ip_gre.c')
-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 eb68a0e34e49..6613edfac28c 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)) { |