From nobody Thu Jul 6 20:30:19 2023 X-Original-To: dev-commits-src-main@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 4Qxp7H6vF0z4kngq; Thu, 6 Jul 2023 20:30:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qxp7H6JLhz49kw; Thu, 6 Jul 2023 20:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688675419; 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=44FObnbhheaCKJ9fHFR4I2Dgor2qE7AClc5Iw01LMyw=; b=eBh/K8TbdWJO+idVy6St62jSbpDJUdsvgeR0XabBG+y3nwlY4UjtymxaY03PcRQhMvh1g+ 5U3ZBQN7JyH/z15Sh3zHiqiKEPtcU8CXulU+8ng5afqar7cFfYeSKbWgeiKl7AGaxExZiD bfVxxPGPAxdopdkmqgyROTacKNMjYcCNjdm9WFa/aY9AbYuWYfriINDf4hm+BAhEYhqGf4 hRSFMQQksHY/2GELFt/Lk1b9PyErSYTg26kxTfJtKqsBAMwXCKBbOdh5V3dYOzeomQwlCq zcYj4lqUEAGuiAL94Dx56UPSoLjUkE1DG9/hmV/zmIRjMvTcOMpSriUn1IKNgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688675419; 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=44FObnbhheaCKJ9fHFR4I2Dgor2qE7AClc5Iw01LMyw=; b=rjhbU3vU2GaMObo2xDATR09B3lzA/HITp/wzkh9DGCdzm/R6+KOJyHEtnhs3kEQmAXDRXW 9n5HiwhCStslOKKsAxcbPk23KjzBrhJLdLKttybBoz1wyifTJxecKdm6wa9ybNTmhEs8X2 Tz/4b8cR6TjsjIX2bGz1JK5/xGaRboNlhOQfvLvc46NpeQniJKrjtTrhLWK2IUihk6sVUr JOv05QPOcht6pVTFJDyClNy4VSuBBPkdnEqqMI+BU4Qvnzo+6J5ijbPBh6PQczhT4sH7xh Dp/rI0+qsYPoiPl44YspjZxYVysFDRiekux+zEKDBWONGIyMNlQgUW/jdYG8RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688675419; a=rsa-sha256; cv=none; b=rNPXvkVhmy0VuyS6dQucqJaxDhs8QU/mAJVfRWAmeyXuArCN1AwXxfLBXWrRLdg+chl9fX 0pQTby+Qm+ZCvDmjJuushvuAqWu3ditsPdzq/2EuiJHIYJFrDvCj+DjVdq+SgmkfKTWTH3 aPa6SHt0jsf2kLGfeNN76ubXXqXEQmf2HN1DaWFypYXR1ZtzbIHFB0O/ifLnF2dUGQoKTw wKI68zc7PzRIRpqJQn5Pb7LYKLDTlJloIVhXw0QNUr0bIUGmkCPh/5/lQsNi+Ifv0anLNT NLl++Gd3TG7E/1VzFgOZSow6LIibsQYhjh/ZkFqBStUbpt0WPeRE5/dmq7tRSA== 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 4Qxp7H5FfXz19RK; Thu, 6 Jul 2023 20:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 366KUJP1089171; Thu, 6 Jul 2023 20:30:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 366KUJ69089170; Thu, 6 Jul 2023 20:30:19 GMT (envelope-from git) Date: Thu, 6 Jul 2023 20:30:19 GMT Message-Id: <202307062030.366KUJ69089170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 8579bf27d7d3 - main - inline_fls - HAVE_INLINE_FLSLL is always true List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8579bf27d7d38bc1dc0e92b83b88e5a9f2dd4671 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=8579bf27d7d38bc1dc0e92b83b88e5a9f2dd4671 commit 8579bf27d7d38bc1dc0e92b83b88e5a9f2dd4671 Author: Doug Moore AuthorDate: 2023-07-06 20:27:31 +0000 Commit: Doug Moore 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