gre6: use log_ecn_error module parameter in ip6_tnl_rcv()
authorAlexey Kodanev <alexey.kodanev@oracle.com>
Fri, 17 Nov 2017 16:16:17 +0000 (19:16 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Dec 2017 08:53:07 +0000 (09:53 +0100)
[ Upstream commit 981542c526ecd846920bc500e9989da906ee9fb9 ]

After commit 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call
common GRE functions") it's not used anywhere in the module, but
previously was used in ip6gre_rcv().

Fixes: 308edfdf1563 ("gre6: Cleanup GREv6 receive path, call common GRE functions")
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv6/ip6_gre.c

index 59c121b932ac5140380e4592568e455caa64287e..5d6bee070871f1f5b8468ea75cdf406de4dfe035 100644 (file)
@@ -461,7 +461,7 @@ static int ip6gre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)
                                      &ipv6h->saddr, &ipv6h->daddr, tpi->key,
                                      tpi->proto);
        if (tunnel) {
-               ip6_tnl_rcv(tunnel, skb, tpi, NULL, false);
+               ip6_tnl_rcv(tunnel, skb, tpi, NULL, log_ecn_error);
 
                return PACKET_RCVD;
        }