Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3760712pxt; Tue, 10 Aug 2021 10:41:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmRHWttEx4g95cdpvxMI9kkEDYx9pVHFHggTOkyMsrTnNugSWcShejYSR1T2PCccaY8uLM X-Received: by 2002:a17:906:a08a:: with SMTP id q10mr28294037ejy.100.1628617284580; Tue, 10 Aug 2021 10:41:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628617284; cv=none; d=google.com; s=arc-20160816; b=L4tsv5xpG+4/mKkh+B+4MlmCQZEm/S0SzzE7Mh39alIZ6ZxRXMZR4xi8hLRtUYxCKp 1sYcMTChxg7Yd/S+L3EvZXJmtPNAdsUcWPBHz+KDzIxvtByHIz//kIPef7fLBEmfCzOz NU+K7wDVQ0QTb7nsfu2gIbu9ybhBt6CE8XvvjG3sAZaSKt+GhsYxbkt1Z0q8xDyrb81E zasqpLYbLu9JbdKa8mN3tuHN+eguwymCWUZP96qsi+LeLf/+sLhl1JEd2Qw8M2prJrMb Y4/TX6QW32IG9a2mRQfUAXWjR/kaZAWOb2Jv9t/ku/iRyDo3bQNrJuh4K6lYp75DD2d9 zNzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dj9qdX7cOMVGLWHApuEEDdiKZZ+M/E+Wr1DVFnb822Y=; b=WjJ4YQIPOAP9i9CgPjBcSMpF6f8MeBgbJKmP8+7CqbNkDqWly2zOxsW+mlFREqJpsW MYdXVOdP0xcGrC+6cXIjEVjJ0CL0i3nlzpUgeI2ebSk1++uJv0rIU4eE+xIAOZsdaeNi 68DlTe6yQLA+dNeLRoh7+qyb3TtdXQIARb70lpYrPVHPbWqTtcwrXbSEOJNaPwz5oTTM dbupon/S9lXM7APgAyubZGPP4HLemNodSIHLdg+LGKS5sveHLPViRFeGOZJ8td6r5cbf EqvSc9X5rqoBNBmxv73ClQC96w7xhUD3XR9hxdiqFNNdaCCDcfo8abNA9OSpm6u6Ah2d u5jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lor7ljvJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id la2si20888547ejc.153.2021.08.10.10.41.00; Tue, 10 Aug 2021 10:41:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lor7ljvJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233250AbhHJRgJ (ORCPT + 99 others); Tue, 10 Aug 2021 13:36:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:42464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233137AbhHJReu (ORCPT ); Tue, 10 Aug 2021 13:34:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A4BE76109F; Tue, 10 Aug 2021 17:34:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628616868; bh=DSyiZh3eH9KuUQbPDRuhIrdqGMTCBIAl4rChqICO6yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lor7ljvJwaV5fEPrNvdiH7dGRCIQRPTozITm+/Ck+TypoKH5JZmfSxdUpa0LULizv lpOZv7VUBMmrbWG9n1864AiFlOhmzUqUMwwvbzDEuTjNLSiV0AFzjBbFzDkdacb9Tt CHE8j0L0Yf1Uw850e4Hjv+qUtlEbJgFN10KEVXTk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vadim Fedorenko , Antoine Tenart , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 28/85] net: ipv6: fix returned variable type in ip6_skb_dst_mtu Date: Tue, 10 Aug 2021 19:30:01 +0200 Message-Id: <20210810172949.151436253@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810172948.192298392@linuxfoundation.org> References: <20210810172948.192298392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Antoine Tenart [ 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 --- 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 feeecbc80e72..2c739fc752e1 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -263,7 +263,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