From nobody Fri Mar 04 22:14:18 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 00A9719E58A5; Fri, 4 Mar 2022 22:14: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 4K9MZy6brHz3l7d; Fri, 4 Mar 2022 22:14:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646432058; 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=Nr4yhSXmLFSjvapsxT0VSnk0pTHUWHZBuZgY5qV2x48=; b=Ck49MZyx9F7jeGXSp3YRTBc64VmYk3XdhwB+Z4nrIdeFQt9Ios6L8QeXcVgZAgVPKrqKXV jnIXGmCFk9GGpHQZGTeunBQV6rZS+a4aut7sL0pRjYzD3/E1xQD56hC8ahideD5w3xqc8D j5P9e7Xv5cQwD+WxYMvyIur8iBtjQBQ1Xasvaii4elR2E/XukmsY0Jjbm7WzI8OngPf6OT XRhytIGY/Nsd2pLZBGcy+tvOAsoOx0f8HqiCJDE3gww3otsE3rVTAcHsTgyUt3P0KIBfHl zJy7POWtiCxDazRXi+zOegRW7Bis6fjzxa0sVJ8wG1oQ83T6NR9DsCqF7osmIQ== 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 C2D71145B0; Fri, 4 Mar 2022 22:14:18 +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 224MEI73071385; Fri, 4 Mar 2022 22:14:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 224MEItM071384; Fri, 4 Mar 2022 22:14:18 GMT (envelope-from git) Date: Fri, 4 Mar 2022 22:14:18 GMT Message-Id: <202203042214.224MEItM071384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 61d83041ab11 - main - ice(4): Fix build error when ALTQ is enabled 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61d83041ab111fe491409f2eca2b528108b9ec29 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646432058; 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=Nr4yhSXmLFSjvapsxT0VSnk0pTHUWHZBuZgY5qV2x48=; b=WuwgR+exYsleAivMTPMpiBThn7VXDNqtjn2yq3cis3uywOhswD3rTW32o47Y4uqOJ1OQq9 fTbCJVqQ4HlChpqgMHhcegLTgZGb4Di/Oz7YMHJezGGCXSShagpxQFd5iSTi83BGuSzXRd ZTPgXuVCtTiDMslqz7v0W9U92oV+ha3Mv1TKlQOrZ/2sj1PznTOka8XZ3b3LN551V7RKW+ +t+JILfyywTaP2Igf2HdapGXzWFhLWaUo03GnIXozqdHEC4yjB3tLBUMhr9JNQXeiawSuF 2ERBTUF/CnKoTcjy5m1ZGgVdQxmBZJHRw24No7OdmOSf40OO8KHrlJaZlyVhNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646432058; a=rsa-sha256; cv=none; b=rlVFszXL3FCOhmQUPm2lKKTYxavHku/3eE4S5MAOmLHh4nqNe8WYXU0yLd+uEQgkthdRXf fL8uo3iaFKu38fV7ZBkegtFlHVDvQjkbFtb9dK2FOEakjHxPKV+WfhhMf90ouKbxZUYyRr p0hX+OIaMe7qprQVAklhopj1PagcZGQ9Vqr7v/yaESSMkk7o1AJnADZfIQlBCgC/pe13tB xQEwnYnKPt2dFjSGhLIk2IrMEDffGaDdxqvGQbzhiGB0o/dup7TUlbfHPwj2+nHP+glaDF iTApwyFKYUuACiNoCA/J4kJFhzsm7S8QV3nrZ9qe6AAoVhxyPzikbTWqGznjeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=61d83041ab111fe491409f2eca2b528108b9ec29 commit 61d83041ab111fe491409f2eca2b528108b9ec29 Author: Eric Joyner AuthorDate: 2022-03-04 22:11:14 +0000 Commit: Eric Joyner CommitDate: 2022-03-04 22:11:14 +0000 ice(4): Fix build error when ALTQ is enabled The previous commit (56429daea2) that updated the driver included a bug where a variable was undefined when ALTQ was enabled; this fixes that issue to declare the missing variable. This wasn't caught before because we don't use ALTQ, and so it fell on the Jenkins CI's LINT builds to catch it. Signed-off-by: Eric Joyner Reported by: Jenkins CI MFC after: 3 days MFC with: 56429daea2 Sponsored by: Intel Corporation --- sys/dev/ice/ice_iflib_txrx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c index 7b5c2a9733fc..52c4364a2430 100644 --- a/sys/dev/ice/ice_iflib_txrx.c +++ b/sys/dev/ice/ice_iflib_txrx.c @@ -415,9 +415,13 @@ ice_ift_queue_select(void *arg, struct mbuf *m) u16 tc_base_queue, tc_qcount; u8 up, tc; +#ifdef ALTQ + /* Included to match default iflib behavior */ /* Only go out on default queue if ALTQ is enabled */ + struct ifnet *ifp = (struct ifnet *)iflib_get_ifp(sc->ctx); if (ALTQ_IS_ENABLED(&ifp->if_snd)) return (0); +#endif if (!ice_test_state(&sc->state, ICE_STATE_MULTIPLE_TCS)) { if (M_HASHTYPE_GET(m)) {