lkml.org 
[lkml]   [2015]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2 011/124] ipv6: gre: support SIT encapsulation
    Date
    4.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 7e3b6e7423d5f994257c1de88e06b509673fdbcf ]

    gre_gso_segment() chokes if SIT frames were aggregated by GRO engine.

    Fixes: 61c1db7fae21e ("ipv6: sit: add GSO/TSO support")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/gre_offload.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/net/ipv4/gre_offload.c
    +++ b/net/ipv4/gre_offload.c
    @@ -36,7 +36,8 @@ static struct sk_buff *gre_gso_segment(s
    SKB_GSO_TCP_ECN |
    SKB_GSO_GRE |
    SKB_GSO_GRE_CSUM |
    - SKB_GSO_IPIP)))
    + SKB_GSO_IPIP |
    + SKB_GSO_SIT)))
    goto out;

    if (!skb->encapsulation)



    \
     
     \ /
      Last update: 2015-12-07 17:41    [W:4.030 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site