Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Jun 2025 09:14:08 GMT
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: bba50bee339b - stable/14 - LinuxKPI: skbuff: make csum_unfold return __wsum
Message-ID:  <202506110914.55B9E8gt061720@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=bba50bee339b8665ff11bec9ae8e8f06907d4a35

commit bba50bee339b8665ff11bec9ae8e8f06907d4a35
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-05-10 01:39:25 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506110914.55B9E8gt061720>