lkml.org 
[lkml]   [2015]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 95/96] ipv6: gre: support SIT encapsulation
    Date
    3.13.11-ckt30 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <edumazet@google.com>

    commit 7e3b6e7423d5f994257c1de88e06b509673fdbcf upstream.

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    net/ipv4/gre_offload.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
    index f70d768..47af47e 100644
    --- a/net/ipv4/gre_offload.c
    +++ b/net/ipv4/gre_offload.c
    @@ -41,7 +41,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
    SKB_GSO_DODGY |
    SKB_GSO_TCP_ECN |
    SKB_GSO_GRE |
    - SKB_GSO_IPIP)))
    + SKB_GSO_IPIP |
    + SKB_GSO_SIT)))
    goto out;

    if (unlikely(!pskb_may_pull(skb, sizeof(*greh))))
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-11-13 23:21    [W:4.208 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site