Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Jul 2023 20:30:19 GMT
From:      Doug Moore <dougm@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 8579bf27d7d3 - main - inline_fls - HAVE_INLINE_FLSLL is always true
Message-ID:  <202307062030.366KUJ69089170@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by dougm:

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

commit 8579bf27d7d38bc1dc0e92b83b88e5a9f2dd4671
Author:     Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2023-07-06 20:27:31 +0000
Commit:     Doug Moore <dougm@FreeBSD.org>
CommitDate: 2023-07-06 20:27:31 +0000

    inline_fls - HAVE_INLINE_FLSLL is always true
    
    flsll is inlined, or replaced by a smart binary search implementation,
    on all architectures, and HAVE_INLINE_FLSLL is #defined always. So
    remove code the the #undefined case.
    
    Reviewed by:    mhorne, tuexen
    Differential Revision:  https://reviews.freebsd.org/D40704
---
 sys/netinet/tcp_lro.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c
index 285207f02739..bea9f8f4d39e 100644
--- a/sys/netinet/tcp_lro.c
+++ b/sys/netinet/tcp_lro.c
@@ -1472,21 +1472,7 @@ tcp_lro_flush(struct lro_ctrl *lc, struct lro_entry *le)
 	LIST_INSERT_HEAD(&lc->lro_free, le, next);
 }
 
-#ifdef HAVE_INLINE_FLSLL
 #define	tcp_lro_msb_64(x) (1ULL << (flsll(x) - 1))
-#else
-static inline uint64_t
-tcp_lro_msb_64(uint64_t x)
-{
-	x |= (x >> 1);
-	x |= (x >> 2);
-	x |= (x >> 4);
-	x |= (x >> 8);
-	x |= (x >> 16);
-	x |= (x >> 32);
-	return (x & ~(x >> 1));
-}
-#endif
 
 /*
  * The tcp_lro_sort() routine is comparable to qsort(), except it has



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