summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLance Richardson <lrichard@redhat.com>2016-09-23 15:50:29 -0400
committerDavid S. Miller <davem@davemloft.net>2016-09-24 09:44:31 -0400
commitdb32e4e49ce2b0e5fcc17803d011a401c0a637f6 (patch)
treedd23eb8d057170e143636366351f17c59626499b /net
parent019b1c9fe32a2a32c1153e31375f87ec3e591273 (diff)
downloadlinux-db32e4e49ce2b0e5fcc17803d011a401c0a637f6.tar.gz
linux-db32e4e49ce2b0e5fcc17803d011a401c0a637f6.tar.bz2
linux-db32e4e49ce2b0e5fcc17803d011a401c0a637f6.zip
ip6_gre: fix flowi6_proto value in ip6gre_xmit_other()
Similar to commit 3be07244b733 ("ip6_gre: fix flowi6_proto value in xmit path"), set flowi6_proto to IPPROTO_GRE for output route lookup. Up until now, ip6gre_xmit_other() has set flowi6_proto to a bogus value. This affected output route lookup for packets sent on an ip6gretap device in cases where routing was dependent on the value of flowi6_proto. Since the correct proto is already set in the tunnel flowi6 template via commit 252f3f5a1189 ("ip6_gre: Set flowi6_proto as IPPROTO_GRE in xmit path."), simply delete the line setting the incorrect flowi6_proto value. Suggested-by: Jiri Benc <jbenc@redhat.com> Fixes: c12b395a4664 ("gre: Support GRE over IPv6") Reviewed-by: Shmulik Ladkani <shmulik.ladkani@gmail.com> Signed-off-by: Lance Richardson <lrichard@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ip6_gre.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 704274cbd495..edc3daab354e 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -648,7 +648,6 @@ static int ip6gre_xmit_other(struct sk_buff *skb, struct net_device *dev)
encap_limit = t->parms.encap_limit;
memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6));
- fl6.flowi6_proto = skb->protocol;
err = gre_handle_offloads(skb, !!(t->parms.o_flags & TUNNEL_CSUM));
if (err)