diff options
| author | Lance Richardson <lrichard@redhat.com> | 2016-09-23 15:50:29 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-11-24 16:24:03 +0100 |
| commit | 8026beb452017c7030389b0ee7b00a8d08d6bd5a (patch) | |
| tree | 0b72e022567eb09cc1ea0f7a0551df44f3461364 | |
| parent | 511ad85e5eb023f16494d703446f3d7b7f09e879 (diff) | |
| download | lwn-8026beb452017c7030389b0ee7b00a8d08d6bd5a.tar.gz lwn-8026beb452017c7030389b0ee7b00a8d08d6bd5a.zip | |
ip6_gre: fix flowi6_proto value in ip6gre_xmit_other()
[ Upstream commit db32e4e49ce2b0e5fcc17803d011a401c0a637f6 ]
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | net/ipv6/ip6_gre.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 737af492ed75..6b5acd50103f 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -895,7 +895,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 = ip6gre_xmit2(skb, dev, 0, &fl6, encap_limit, &mtu); |