lkml.org 
[lkml]   [2017]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 113/164] gre6: use log_ecn_error module parameter in ip6_tnl_rcv()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexey Kodanev <alexey.kodanev@oracle.com>


    [ 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 | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/ipv6/ip6_gre.c
    +++ b/net/ipv6/ip6_gre.c
    @@ -461,7 +461,7 @@ static int ip6gre_rcv(struct sk_buff *sk
    &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;
    }

    \
     
     \ /
      Last update: 2017-12-12 14:40    [W:4.414 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site