From: Antoine Tenart Date: Tue, 3 Aug 2021 10:00:16 +0000 (+0200) Subject: net: ipv6: fix returned variable type in ip6_skb_dst_mtu X-Git-Tag: v4.19.203~41 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=08882fba72a9be9446d744c60d6d418f547a0c96;p=users%2Fdwmw2%2Flinux.git net: ipv6: fix returned variable type in ip6_skb_dst_mtu [ 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 Signed-off-by: Antoine Tenart Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index a8f5410ae0d4b..f237573a26513 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -243,7 +243,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;