From nobody Wed Jun 11 09:14:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bHKjD3t6rz5yybM; Wed, 11 Jun 2025 09:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHKjD3Kn8z3lFJ; Wed, 11 Jun 2025 09:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nh1mz93BGM/NMAp7e6RFrlv3Dyad/UdtkKtYmpICt2Q=; b=a/tWucTSCR4Uog4/OHL1x3IDsOxBh4rTwNB1Rm7fXGUW+0ssqZ77A5refUZy2YONCmvkF/ PXz2624LL9RHFErdZRhA/QSa/r44mbZWoVC9vXZ54Lklt5/ix1bF+wxg/P5RCnPb+JIQQW xrKw+KaKntYnVpj54VUi7qhv/TD1eZSLZGNm6LeaABAGhb///v6vGYpRAS2AwBdDsjDGFp mY1DX66SPLhR3NbkwbYxT3tktn/OmshTAfc6sJwLhFWB+KhkQTg+LBL0ePBqwvZLWrPhEI C+rVO9LAeN/NbaU7kTw/u9jF11/5bmGTTS59b9CEHID68foZwPE+cKFGTxJB4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nh1mz93BGM/NMAp7e6RFrlv3Dyad/UdtkKtYmpICt2Q=; b=wLG33qmWjncZw+vjR4mWf6LgtUrL/kOsiaLooPr4Wd+9eWQP2KxJFccVnxq0xFB04cdmwE tsmcHw/LnvifuHr40XJqZ+3OHWpst+zVDn7lGLh14Gt/gs1FD0pgQ1qrRGbIebui+e+gOW Fln9QrVNZ2e1QKazm2cQsPtvb2ukkO4PIMcOcYbp4KUol+9TxKwQM0RkYt0PgrlYev6Uwo ylJg7oOd/wF2K/am/0Ettaj822DjpvCX8O3LsR98dN9/zb/E2AZvpaxx0HLe9feE+0NVxI NfRSWPm9QGS7Xf9r232K7Bl+fug/qgJCGLnRdc1SEDmeWZwcIT3E7GHTImU6ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633248; a=rsa-sha256; cv=none; b=B1SvP4schklDu2D0wKy7S6SDnPQcDx6dhaC6j4vVcLyz+P9jIFP3ztrEtHqAIecwQybcHS bK/cR1krjvZVOSRbjogwh/VwNA+uomk32Jt6WviOPxB2rZ8OLQKrupcV2OL3SiOsNrK9r+ Wrp3k0iHdJUEK4sW/vhMNuRQyFY/76UkpqI2PrQjtYdL4ECDzvGaeMnNoRiDc7q4MDWhy3 2CycrDjbogO6pMpOCpAfpuT5etChjWDRfQ/eDMoRP4NHOCj26rWf1j1Qe4/QevNqL0iGTf IPRK5wnlpFrPA4cvZmo7itFIGxjt2gWsIdEphI7ACQh4MrqyPURV8c2aeK3WCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bHKjD2dSnz4lP; Wed, 11 Jun 2025 09:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55B9E8BH061723; Wed, 11 Jun 2025 09:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9E8gt061720; Wed, 11 Jun 2025 09:14:08 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:14:08 GMT Message-Id: <202506110914.55B9E8gt061720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bba50bee339b - stable/14 - LinuxKPI: skbuff: make csum_unfold return __wsum List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bba50bee339b8665ff11bec9ae8e8f06907d4a35 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bba50bee339b8665ff11bec9ae8e8f06907d4a35 commit bba50bee339b8665ff11bec9ae8e8f06907d4a35 Author: Bjoern A. Zeeb AuthorDate: 2025-05-10 01:39:25 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-10 23:37:38 +0000 LinuxKPI: skbuff: make csum_unfold return __wsum Given the internal field now stores a __wsum csum (after we added the type) also make sure csum_unfold() returns a __wsum. Sponsored by: The FreeBSD Foundation Fixes: 59481c7db234 (cherry picked from commit 36ca21722c2700e00e41444a29aeabf246eea90d) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 8fe6bf158bc6..422bf99929c2 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -1046,7 +1046,7 @@ skb_orphan(struct sk_buff *skb) SKB_TODO(); } -static inline __sum16 +static inline __wsum csum_unfold(__sum16 sum) { return (sum);