From nobody Wed Nov 24 21:29:21 2021 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 D35DA18AA52D; Wed, 24 Nov 2021 21:29:22 +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 4HzvKF6Pw6z3vbk; Wed, 24 Nov 2021 21:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B87831143D; Wed, 24 Nov 2021 21:29:21 +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 1AOLTL9n023422; Wed, 24 Nov 2021 21:29:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AOLTLbE023421; Wed, 24 Nov 2021 21:29:21 GMT (envelope-from git) Date: Wed, 24 Nov 2021 21:29:21 GMT Message-Id: <202111242129.1AOLTLbE023421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 2cedfc3f7eb5 - main - if_epair: ifdef vars only used with ALTQ 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cedfc3f7eb58c8a3d35de226c63066946d9beb0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637789362; 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=tAiEuI31Iz2SWS7ZrEeHs7SW1qqufneroMwofDyMiZY=; b=CY4bpV7q8yn6Z2PLmayv82FYK/68fU0b07g5Y6b5OetPPAfetUSk3qsxO3C+dvP3jBrFDa d8+cfROKU9RmtbP7hHIHZeMBqsEp0xRJ1tNTcq5u8TMQ1TA257XVvqEzbtNhCYFsKBGBGY 2vxCUYjGWqjoFykYqOrJd2daGCEQoH8YHuifGKHZ5a/ViBoXBH7XVD+FeTau3VJw2BLsVF eUxduP05cu7ZX7VTrunn4cdm9AGbCujic0slyTnAmxA6vELnhTO4tGZUbp1J1ZdWWxP+48 xj8W5t2O9XmYitganPuVToswEpZv20wZhpOSE2FE0ayPDRruwqtN19T4wk1k8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637789362; a=rsa-sha256; cv=none; b=TjidwdoWa6qswDQWVdzwrg1T+R9wHaj8Q9zIiyszbmeltN3PZp0vk8ddZiBv2wgdaYtQzk 8pCF0tozLQlXGqPHMWVuFJm+9N04pkXbhKi/PCdJSn2KezIRFQbrqqQeX3F6u/nKHi1wS9 /MbXqTQvUNQsXYfajgHHO6GU6QHkqv4eJI4M/mu9BtBhmSpDnrr/pMJSpCeCUiAUtCrsIz Tq8EtHfDYCTSxHIvJzuj/AFxQ5aD/3/AmBZ/si4oDNZ6oaBR4t0shnP1P0GZ6lzQodMiQI StGqXlIL3vQEEASpEAsQ95MigyhHykLE97gTVSrzTP3PH9JCy2T7zbDBYm0gIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2cedfc3f7eb58c8a3d35de226c63066946d9beb0 commit 2cedfc3f7eb58c8a3d35de226c63066946d9beb0 Author: Mateusz Guzik AuthorDate: 2021-11-24 21:28:54 +0000 Commit: Mateusz Guzik CommitDate: 2021-11-24 21:28:54 +0000 if_epair: ifdef vars only used with ALTQ Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_epair.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index 89483db46337..699d74ee4fb4 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -271,8 +271,11 @@ epair_transmit(struct ifnet *ifp, struct mbuf *m) { struct epair_softc *sc; struct ifnet *oifp; - int error, len; + int error; +#ifdef ALTQ + int len; short mflags; +#endif if (m == NULL) return (0); @@ -309,10 +312,11 @@ epair_transmit(struct ifnet *ifp, struct mbuf *m) m_freem(m); return (0); } + +#ifdef ALTQ len = m->m_pkthdr.len; mflags = m->m_flags; -#ifdef ALTQ /* Support ALTQ via the classic if_start() path. */ IF_LOCK(&ifp->if_snd); if (ALTQ_IS_ENABLED(&ifp->if_snd)) {