Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Nov 2021 21:29:21 GMT
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 2cedfc3f7eb5 - main - if_epair: ifdef vars only used with ALTQ
Message-ID:  <202111242129.1AOLTLbE023421@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=2cedfc3f7eb58c8a3d35de226c63066946d9beb0

commit 2cedfc3f7eb58c8a3d35de226c63066946d9beb0
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2021-11-24 21:28:54 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
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)) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111242129.1AOLTLbE023421>