lkml.org 
[lkml]   [2016]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 031/101] ipv6/ila: fix nlsize calculation for lwtunnel
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

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

    From: Nicolas Dichtel <nicolas.dichtel@6wind.com>

    [ Upstream commit 79e8dc8b80bff0bc5bbb90ca5e73044bf207c8ac ]

    The handler 'ila_fill_encap_info' adds one attribute: ILA_ATTR_LOCATOR.

    Fixes: 65d7ab8de582 ("net: Identifier Locator Addressing module")
    CC: Tom Herbert <tom@herbertland.com>
    Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv6/ila/ila_lwt.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/net/ipv6/ila/ila_lwt.c
    +++ b/net/ipv6/ila/ila_lwt.c
    @@ -120,8 +120,7 @@ nla_put_failure:

    static int ila_encap_nlsize(struct lwtunnel_state *lwtstate)
    {
    - /* No encapsulation overhead */
    - return 0;
    + return nla_total_size(sizeof(u64)); /* ILA_ATTR_LOCATOR */
    }

    static int ila_encap_cmp(struct lwtunnel_state *a, struct lwtunnel_state *b)

    \
     
     \ /
      Last update: 2016-05-17 04:01    [W:4.195 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site