From nobody Fri Apr 08 00:03:30 2022 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 D37811A87A05; Fri, 8 Apr 2022 00:03:30 +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 4KZJPG4pKXz4kvG; Fri, 8 Apr 2022 00:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376210; 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=fNUPhYlWQ4a7rOPiyEWKQh6skjweu5TCDkTl+iILyUU=; b=ocqRvpFaIH69jCWub8Y27fehMJAp/bRyD4jG4yjYvE03AQ7yr1D3QJoH76SxPXyu6yk8Hs ylTQaKZyPOCV4aCsYAFSJfBtBZKGV4cPkAy3SHHIbf1KbdVFMlsYY2yze0c74IDs7EHu92 DJVdLsUFUOqMZtAPAfVpGdLEZLNuRh5/gtLIOF9fA9qMiv/s79Kp59JsUAQrprWO0Vn5BM fiukHLKbLAH03zNWU1rbEG0UgOpkC0Rp1joOvLHrorSjRQH36E++foLg046o/OSBtNjTxq Lq9V7FlyeDVTT1KnbjpyIPUVbXfjNKesMhfWfloVU3AdplR4sjOi3GDMU5mRuA== 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 628111A49A; Fri, 8 Apr 2022 00:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23803UTB086438; Fri, 8 Apr 2022 00:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803Upi086437; Fri, 8 Apr 2022 00:03:30 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:30 GMT Message-Id: <202204080003.23803Upi086437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3415775dfa42 - main - qlnx: Move all references to total_rx_count under #ifdef QLNX_SOFT_LRO. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3415775dfa428da1fe63bffce0c26cfaa92076b8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376210; 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=fNUPhYlWQ4a7rOPiyEWKQh6skjweu5TCDkTl+iILyUU=; b=cH/euC4hFce4obb+SFUySmqa18z9TdXCx2tEromYOeI2dcOhVpVYKBaD2wzxEAbWyhcqT4 k+qE5WEkZWBeW3ThXSaFmJog8c/sMWeGPGc8BzsBqXW8ReCdKIFRxp9tRKIqNAs6dzcK4f QUCv78LUyqA5rfoR52CO5SFNctbMHyPKstP4PgPLT1RnGbeoDghsGFg6KtRSC++8oj/PMA 5+8/Xux6D5ZhxT+T2vSSlvy3NdJhk3ASZbtznRk6dbB0SeNi3vOoypvTC5UA9IeIKYQsaL BknoYjiEzUMUnqxnLJEj4tbBFfUBGTOyEglznlHgGAqzio2WI5xLC9wdR6or5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376210; a=rsa-sha256; cv=none; b=RVUuC3ChK12jG7CxqWLlpnQgxrOK5ZIGOSnsArI7XeOwi2K4d/VshtEmB5izKj6ShEGxvB 5YzAD9v7BfCXrGGOJ7pgOx3fZmLus14sHLwqLkw0jGJlO1K4WwNUnZQtScfwfA/M7Jritk fGbPUO6FK9RuuezrtY9vquoMC6TA+WiQ9o7ImZKvp5ssBN1NEpK9rbLk8ZHB07EHkmF7ax shq/0xSZmEe0ocGgDNOdSJvSgJeNbGKk9oAYy61UWHAS7xu7jGvwRys1Xm2qXx8PQMM2Xf dExlZK06fq2DFs9pg41IHJCreNXMC2Nd0VHm/q+YVva2mknDtfp/qlMvzO/uuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3415775dfa428da1fe63bffce0c26cfaa92076b8 commit 3415775dfa428da1fe63bffce0c26cfaa92076b8 Author: John Baldwin AuthorDate: 2022-04-08 00:01:27 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:27 +0000 qlnx: Move all references to total_rx_count under #ifdef QLNX_SOFT_LRO. --- sys/dev/qlnx/qlnxe/qlnx_os.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 3278cf3a4333..4c1a55064a68 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -4872,7 +4872,10 @@ qlnx_fp_isr(void *arg) if (fp == NULL) { ha->err_fp_null++; } else { - int rx_int = 0, total_rx_count = 0; + int rx_int = 0; +#ifdef QLNX_SOFT_LRO + int total_rx_count = 0; +#endif int lro_enable, tc; struct qlnx_tx_queue *txq; uint16_t elem_left; @@ -4918,7 +4921,9 @@ qlnx_fp_isr(void *arg) if (rx_int) { fp->rx_pkts += rx_int; +#ifdef QLNX_SOFT_LRO total_rx_count += rx_int; +#endif } } while (rx_int);