lkml.org 
[lkml]   [2021]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 041/135] net: ipv6: fix returned variable type in ip6_skb_dst_mtu
    Date
    From: Antoine Tenart <atenart@kernel.org>

    [ Upstream commit 4039146777a91e1576da2bf38e0d8a1061a1ae47 ]

    The patch fixing the returned value of ip6_skb_dst_mtu (int -> unsigned
    int) was rebased between its initial review and the version applied. In
    the meantime fade56410c22 was applied, which added a new variable (int)
    used as the returned value. This lead to a mismatch between the function
    prototype and the variable used as the return value.

    Fixes: 40fc3054b458 ("net: ipv6: fix return value of ip6_skb_dst_mtu")
    Cc: Vadim Fedorenko <vfedorenko@novek.ru>
    Signed-off-by: Antoine Tenart <atenart@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/net/ip6_route.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
    index 42fe4e1b6a8c..44969d03debf 100644
    --- a/include/net/ip6_route.h
    +++ b/include/net/ip6_route.h
    @@ -264,7 +264,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,

    static inline unsigned int ip6_skb_dst_mtu(struct sk_buff *skb)
    {
    - int mtu;
    + unsigned int mtu;

    struct ipv6_pinfo *np = skb->sk && !dev_recursion_level() ?
    inet6_sk(skb->sk) : NULL;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-08-10 20:13    [W:5.301 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site