From nobody Thu Sep 26 05:20:43 2024 X-Original-To: dev-commits-src-all@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 4XDhkz5pn0z5YD6K; Thu, 26 Sep 2024 05:20:43 +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 4XDhkz2sdXz4hKS; Thu, 26 Sep 2024 05:20:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727328043; 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=Ae2Nx1oNrACxDDSfkKXGlpjDTVz4n/rvJM0qblJXRHc=; b=Qkkmnv+t8sjlXeSGVsmDqui4fQ2+9pz77dzJ3dHgJmfArEAOsFvVxFGLlbLXcLA4kIByHY BfLKpIEJahiuTf2igKjsU9h8fGBF+lTyl8gy5P+KUlRMgwM8CURsEqy9KmOARiGrDJYSv6 aPTL2WwcvfSm0LUDBizV0CL42gguZ2FuDKDUimTwJTlqVu7rQZb6Vp/g6QgLOboCZSa//v KxccahRbleqJ+znpLz7ScQ/M2GzxYRHlDgLX/AuboBBNy8+DqXwqTzNNRu6vHAhUqWvm11 9Bg6UZolofXgTFukR4rIQ21X1xUEFmseO1YrTL8G+qDQZk/Wiw7y5l6IzmEBqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727328043; 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=Ae2Nx1oNrACxDDSfkKXGlpjDTVz4n/rvJM0qblJXRHc=; b=GEs05Y425O98pDg33ZOaTNjZjqCS2xm+eeSnqpEtiL3x6S44MhW+xeJnq1kdkL/2Yfj/r8 gYkKwpg3/1nZ0iCMjJDWz6CDl7W+L4MVn4SWLbTlsUuDDIflIa3AbqqxcCEX0vnubjtayg Id1Dcs8/ts/1pil1xLqJhNoJsiFgClDs/bNnbINTgB8ZZZSD5tjybSRj0pPTWABKqmV53U 9cXo3J5/moYX42N9xZLF12/2oqCzvxFFwwcBhge3lMCYjPsTeCRBvGkHz/nRwCubHo+E9q PVM00ngqliYegVctMjJWx+UCIbMEPgOQ7VypPUyX40hpnjgspXqFLoMf8g2mqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727328043; a=rsa-sha256; cv=none; b=u0fO8zPmRPjUO5jh0eqZ536DoQJ6KV5/20ohKmD+WZxKS53eZBONz+FF/cK81PuI7lrm6q eNjLfu5F1Xr9ESqL3g99/ekcSTFpo58OfRiESIGnxQZ+DCuXTrhA4CsCy/4JmwviYo/ynS Wd4OinBPFpLlSXEDWPKAyAbQOZAmVISDv7EoAl/BJYQAmRMvJ5PDSP7sZXIGiH+Ue+AGdH 4SckHmEoGIDxHbIx8h4BKGYUfw636x/GsqnUMRM95fXzAFtviqVzzrQiYHFIIoI9nzWba7 d9Qig9oKEEF2Ie1KC378TudQIc7dT8JYsGGx7QEknioTiGBHmSqAC6xKoW4B8g== 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 4XDhkz2ThkzjNM; Thu, 26 Sep 2024 05:20:43 +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 48Q5Kh8J079730; Thu, 26 Sep 2024 05:20:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48Q5KhgK079727; Thu, 26 Sep 2024 05:20:43 GMT (envelope-from git) Date: Thu, 26 Sep 2024 05:20:43 GMT Message-Id: <202409260520.48Q5KhgK079727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: a8eb9e3844da - stable/14 - iflib: Prefer C99's __func__ over GCC's __FUNCTION__ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a8eb9e3844dacbf2c3d7e8e85b7fe23c2ea7f7eb Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a8eb9e3844dacbf2c3d7e8e85b7fe23c2ea7f7eb commit a8eb9e3844dacbf2c3d7e8e85b7fe23c2ea7f7eb Author: Zhenlei Huang AuthorDate: 2024-09-22 02:07:38 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-26 05:19:01 +0000 iflib: Prefer C99's __func__ over GCC's __FUNCTION__ MFC after: 3 days (cherry picked from commit b90ba458dcaecc4041e008b99fde003bc9867a0d) --- sys/net/iflib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index c6a01624436c..63a2f6be5b5e 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -3874,7 +3874,7 @@ iflib_completed_tx_reclaim(iflib_txq_t txq, int thresh) if (reclaim <= thresh /* + MAX_TX_DESC(txq->ift_ctx) */) { #ifdef INVARIANTS if (iflib_verbose_debug) { - printf("%s processed=%ju cleaned=%ju tx_nsegments=%d reclaim=%d thresh=%d\n", __FUNCTION__, + printf("%s processed=%ju cleaned=%ju tx_nsegments=%d reclaim=%d thresh=%d\n", __func__, txq->ift_processed, txq->ift_cleaned, txq->ift_ctx->ifc_softc_ctx.isc_tx_nsegments, reclaim, thresh); } @@ -3980,7 +3980,7 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) count = MIN(avail, TX_BATCH_SIZE); #ifdef INVARIANTS if (iflib_verbose_debug) - printf("%s avail=%d ifc_flags=%x txq_avail=%d ", __FUNCTION__, + printf("%s avail=%d ifc_flags=%x txq_avail=%d ", __func__, avail, ctx->ifc_flags, TXQ_AVAIL(txq)); #endif do_prefetch = (ctx->ifc_flags & IFC_PREFETCH);