Module Name: src
Committed By: thorpej
Date: Thu Nov 16 04:30:22 UTC 2023
Modified Files:
src/sys/dev/ic [thorpej-ifq]: hd64570.c
src/sys/dev/ppbus [thorpej-ifq]: if_plip.c
src/sys/dev/qbus [thorpej-ifq]: if_dmc.c
src/sys/dev/usb [thorpej-ifq]: if_umb.c if_upl.c uhso.c
src/sys/net [thorpej-ifq]: if.h if_arcsubr.c if_gif.c if_ieee1394subr.c
if_ipsec.c if_l2tp.c if_loop.c if_ppp.c if_sl.c if_spppsubr.c
if_tun.c
Log Message:
IFQ_CLASSIFY() -> ifq_classify_packet().
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/dev/ppbus/if_plip.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/qbus/if_dmc.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/dev/usb/if_umb.c
cvs rdiff -u -r1.77 -r1.77.8.1 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.37.6.1 -r1.37.6.2 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.305.2.1.2.3 -r1.305.2.1.2.4 src/sys/net/if.h
cvs rdiff -u -r1.85.8.1 -r1.85.8.2 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.157 -r1.157.8.1 src/sys/net/if_gif.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/net/if_ipsec.c
cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.118 -r1.118.8.1 src/sys/net/if_loop.c
cvs rdiff -u -r1.172.8.1 -r1.172.8.2 src/sys/net/if_ppp.c
cvs rdiff -u -r1.136.6.1 -r1.136.6.2 src/sys/net/if_sl.c
cvs rdiff -u -r1.267.4.1 -r1.267.4.2 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.173 -r1.173.8.1 src/sys/net/if_tun.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.57 src/sys/dev/ic/hd64570.c:1.57.8.1
--- src/sys/dev/ic/hd64570.c:1.57 Sat Sep 3 02:48:00 2022
+++ src/sys/dev/ic/hd64570.c Thu Nov 16 04:30:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.57 2022/09/03 02:48:00 thorpej Exp $ */
+/* $NetBSD: hd64570.c,v 1.57.8.1 2023/11/16 04:30:21 thorpej Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.57 2022/09/03 02:48:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.57.8.1 2023/11/16 04:30:21 thorpej Exp $");
#include "opt_inet.h"
@@ -811,7 +811,7 @@ sca_output(
* If the queueing discipline needs packet classification,
* do it before prepending link headers.
*/
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
/*
* determine address family, and priority for this packet
Index: src/sys/dev/ppbus/if_plip.c
diff -u src/sys/dev/ppbus/if_plip.c:1.38 src/sys/dev/ppbus/if_plip.c:1.38.8.1
--- src/sys/dev/ppbus/if_plip.c:1.38 Sun Sep 4 15:59:08 2022
+++ src/sys/dev/ppbus/if_plip.c Thu Nov 16 04:30:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.38 2022/09/04 15:59:08 rjs Exp $ */
+/* $NetBSD: if_plip.c,v 1.38.8.1 2023/11/16 04:30:21 thorpej Exp $ */
/*-
* Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.38 2022/09/04 15:59:08 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.38.8.1 2023/11/16 04:30:21 thorpej Exp $");
/*
* Parallel port TCP/IP interfaces added. I looked at the driver from
@@ -730,7 +730,7 @@ lpoutput(struct ifnet *ifp, struct mbuf
goto endoutput;
}
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
IFQ_ENQUEUE(&ifp->if_snd, m, err);
if (err == 0) {
if ((ifp->if_flags & IFF_OACTIVE) == 0)
Index: src/sys/dev/qbus/if_dmc.c
diff -u src/sys/dev/qbus/if_dmc.c:1.29 src/sys/dev/qbus/if_dmc.c:1.29.8.1
--- src/sys/dev/qbus/if_dmc.c:1.29 Mon Apr 4 19:33:45 2022
+++ src/sys/dev/qbus/if_dmc.c Thu Nov 16 04:30:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmc.c,v 1.29 2022/04/04 19:33:45 andvar Exp $ */
+/* $NetBSD: if_dmc.c,v 1.29.8.1 2023/11/16 04:30:21 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.29 2022/04/04 19:33:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.29.8.1 2023/11/16 04:30:21 thorpej Exp $");
#undef DMCDEBUG /* for base table dump on fatal error */
@@ -771,7 +771,7 @@ dmcoutput(struct ifnet *ifp, struct mbuf
goto bad;
}
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
switch (dst->sa_family) {
#ifdef INET
Index: src/sys/dev/usb/if_umb.c
diff -u src/sys/dev/usb/if_umb.c:1.25 src/sys/dev/usb/if_umb.c:1.25.8.1
--- src/sys/dev/usb/if_umb.c:1.25 Sat Aug 20 11:32:08 2022
+++ src/sys/dev/usb/if_umb.c Thu Nov 16 04:30:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_umb.c,v 1.25 2022/08/20 11:32:08 riastradh Exp $ */
+/* $NetBSD: if_umb.c,v 1.25.8.1 2023/11/16 04:30:21 thorpej Exp $ */
/* $OpenBSD: if_umb.c,v 1.20 2018/09/10 17:00:45 gerhard Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.25 2022/08/20 11:32:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.25.8.1 2023/11/16 04:30:21 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -873,7 +873,7 @@ umb_output(struct ifnet *ifp, struct mbu
* if the queueing discipline needs packet classification,
* do it now.
*/
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
/*
* Queue message on interface, and start output if interface
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.77 src/sys/dev/usb/if_upl.c:1.77.8.1
--- src/sys/dev/usb/if_upl.c:1.77 Thu Mar 3 05:56:28 2022
+++ src/sys/dev/usb/if_upl.c Thu Nov 16 04:30:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.77 2022/03/03 05:56:28 riastradh Exp $ */
+/* $NetBSD: if_upl.c,v 1.77.8.1 2023/11/16 04:30:21 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.77 2022/03/03 05:56:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.77.8.1 2023/11/16 04:30:21 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -270,7 +270,7 @@ upl_output(struct ifnet *ifp, struct mbu
DPRINTFN(10,("%s: %s: enter\n", device_xname(un->un_dev), __func__));
/* If the queueing discipline needs packet classification, do it now. */
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
/*
* Queue message on interface, and start output if interface
Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.37.6.1 src/sys/dev/usb/uhso.c:1.37.6.2
--- src/sys/dev/usb/uhso.c:1.37.6.1 Wed Nov 15 02:08:33 2023
+++ src/sys/dev/usb/uhso.c Thu Nov 16 04:30:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.37.6.1 2023/11/15 02:08:33 thorpej Exp $ */
+/* $NetBSD: uhso.c,v 1.37.6.2 2023/11/16 04:30:21 thorpej Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.37.6.1 2023/11/15 02:08:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.37.6.2 2023/11/16 04:30:21 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2353,7 +2353,7 @@ uhso_ifnet_output(struct ifnet *ifp, str
if (!ISSET(ifp->if_flags, IFF_RUNNING))
return EIO;
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
switch (dst->sa_family) {
#ifdef INET
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.305.2.1.2.3 src/sys/net/if.h:1.305.2.1.2.4
--- src/sys/net/if.h:1.305.2.1.2.3 Wed Nov 15 02:19:00 2023
+++ src/sys/net/if.h Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.305.2.1.2.3 2023/11/15 02:19:00 thorpej Exp $ */
+/* $NetBSD: if.h,v 1.305.2.1.2.4 2023/11/16 04:30:22 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2023 The NetBSD Foundation, Inc.
@@ -1125,21 +1125,6 @@ do { \
} while (/*CONSTCOND*/ 0)
#define IFQ_SET_READY(ifq) altq_set_ready(ifq)
-
-#define IFQ_CLASSIFY(ifq, m, af) \
-do { \
- KASSERT(((m)->m_flags & M_PKTHDR) != 0); \
- mutex_enter((ifq)->ifq_lock); \
- if (ALTQ_IS_ENABLED(ifq)) { \
- if (ALTQ_NEEDS_CLASSIFY(ifq)) \
- (m)->m_pkthdr.pattr_class = \
- (*(ifq)->ifq_altq->altq_classify) \
- ((ifq)->ifq_altq->altq_clfier, (m), (af)); \
- (m)->m_pkthdr.pattr_af = (af); \
- (m)->m_pkthdr.pattr_hdr = mtod((m), void *); \
- } \
- mutex_exit((ifq)->ifq_lock); \
-} while (/*CONSTCOND*/ 0)
#else /* ! ALTQ */
#define IFQ_ENQUEUE(ifq, m, err) \
do { \
@@ -1179,8 +1164,6 @@ do { \
#define IFQ_SET_READY(ifq) /* nothing */
-#define IFQ_CLASSIFY(ifq, m, af) /* nothing */
-
#endif /* ALTQ */
#define IFQ_LOCK_INIT(ifq) (ifq)->ifq_lock = \
Index: src/sys/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.85.8.1 src/sys/net/if_arcsubr.c:1.85.8.2
--- src/sys/net/if_arcsubr.c:1.85.8.1 Wed Nov 15 02:08:34 2023
+++ src/sys/net/if_arcsubr.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.85.8.1 2023/11/15 02:08:34 thorpej Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.85.8.2 2023/11/16 04:30:22 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.85.8.1 2023/11/15 02:08:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.85.8.2 2023/11/16 04:30:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -134,7 +134,7 @@ arc_output(struct ifnet *ifp, struct mbu
* if the queueing discipline needs packet classification,
* do it before prepending link headers.
*/
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
switch (dst->sa_family) {
#ifdef INET
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.157 src/sys/net/if_gif.c:1.157.8.1
--- src/sys/net/if_gif.c:1.157 Sat Sep 3 02:47:59 2022
+++ src/sys/net/if_gif.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.157 2022/09/03 02:47:59 thorpej Exp $ */
+/* $NetBSD: if_gif.c,v 1.157.8.1 2023/11/16 04:30:22 thorpej Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.157 2022/09/03 02:47:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.157.8.1 2023/11/16 04:30:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -537,7 +537,7 @@ gif_output(struct ifnet *ifp, struct mbu
struct psref psref;
int error = 0;
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
if ((error = gif_check_nesting(ifp, m)) != 0) {
m_freem(m);
Index: src/sys/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.69 src/sys/net/if_ieee1394subr.c:1.69.8.1
--- src/sys/net/if_ieee1394subr.c:1.69 Sat Sep 3 02:47:59 2022
+++ src/sys/net/if_ieee1394subr.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ieee1394subr.c,v 1.69 2022/09/03 02:47:59 thorpej Exp $ */
+/* $NetBSD: if_ieee1394subr.c,v 1.69.8.1 2023/11/16 04:30:22 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.69 2022/09/03 02:47:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.69.8.1 2023/11/16 04:30:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -104,7 +104,7 @@ ieee1394_output(struct ifnet *ifp, struc
* If the queueing discipline needs packet classification,
* do it before prepending link headers.
*/
- IFQ_CLASSIFY(&ifp->if_snd, m0, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m0, dst->sa_family);
/*
* For unicast, we make a tag to store the lladdr of the
Index: src/sys/net/if_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.35 src/sys/net/if_ipsec.c:1.35.4.1
--- src/sys/net/if_ipsec.c:1.35 Tue Sep 26 03:43:27 2023
+++ src/sys/net/if_ipsec.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipsec.c,v 1.35 2023/09/26 03:43:27 knakahara Exp $ */
+/* $NetBSD: if_ipsec.c,v 1.35.4.1 2023/11/16 04:30:22 thorpej Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.35 2023/09/26 03:43:27 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.35.4.1 2023/11/16 04:30:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -621,7 +621,7 @@ if_ipsec_output(struct ifnet *ifp, struc
int error;
int bound;
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
error = if_ipsec_check_nesting(ifp, m);
if (error) {
Index: src/sys/net/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.49 src/sys/net/if_l2tp.c:1.49.4.1
--- src/sys/net/if_l2tp.c:1.49 Thu Nov 2 09:43:46 2023
+++ src/sys/net/if_l2tp.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.c,v 1.49 2023/11/02 09:43:46 yamaguchi Exp $ */
+/* $NetBSD: if_l2tp.c,v 1.49.4.1 2023/11/16 04:30:22 thorpej Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.49 2023/11/02 09:43:46 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.49.4.1 2023/11/16 04:30:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -418,7 +418,7 @@ l2tp_output(struct ifnet *ifp, struct mb
return ENETDOWN;
}
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
m->m_flags &= ~(M_BCAST|M_MCAST);
Index: src/sys/net/if_loop.c
diff -u src/sys/net/if_loop.c:1.118 src/sys/net/if_loop.c:1.118.8.1
--- src/sys/net/if_loop.c:1.118 Sun Sep 4 23:34:51 2022
+++ src/sys/net/if_loop.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_loop.c,v 1.118 2022/09/04 23:34:51 thorpej Exp $ */
+/* $NetBSD: if_loop.c,v 1.118.8.1 2023/11/16 04:30:22 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.118 2022/09/04 23:34:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.118.8.1 2023/11/16 04:30:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -279,7 +279,7 @@ looutput(struct ifnet *ifp, struct mbuf
* If the queueing discipline needs packet classification,
* do it before prepending the link headers.
*/
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
M_PREPEND(m, sizeof(uint32_t), M_DONTWAIT);
if (m == NULL) {
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.172.8.1 src/sys/net/if_ppp.c:1.172.8.2
--- src/sys/net/if_ppp.c:1.172.8.1 Wed Nov 15 02:08:34 2023
+++ src/sys/net/if_ppp.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.172.8.1 2023/11/15 02:08:34 thorpej Exp $ */
+/* $NetBSD: if_ppp.c,v 1.172.8.2 2023/11/16 04:30:22 thorpej Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.172.8.1 2023/11/15 02:08:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.172.8.2 2023/11/16 04:30:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -887,7 +887,7 @@ pppoutput(struct ifnet *ifp, struct mbuf
goto bad;
}
- IFQ_CLASSIFY(&ifp->if_snd, m0, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m0, dst->sa_family);
/*
* Compute PPP header.
Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.136.6.1 src/sys/net/if_sl.c:1.136.6.2
--- src/sys/net/if_sl.c:1.136.6.1 Wed Nov 15 02:08:34 2023
+++ src/sys/net/if_sl.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sl.c,v 1.136.6.1 2023/11/15 02:08:34 thorpej Exp $ */
+/* $NetBSD: if_sl.c,v 1.136.6.2 2023/11/16 04:30:22 thorpej Exp $ */
/*
* Copyright (c) 1987, 1989, 1992, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.136.6.1 2023/11/15 02:08:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.136.6.2 2023/11/16 04:30:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -477,7 +477,7 @@ sloutput(struct ifnet *ifp, struct mbuf
struct ifqueue *ifq = NULL;
int s, error;
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
/*
* `Cannot happen' (see slioctl). Someday we will extend
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.267.4.1 src/sys/net/if_spppsubr.c:1.267.4.2
--- src/sys/net/if_spppsubr.c:1.267.4.1 Wed Nov 15 02:08:34 2023
+++ src/sys/net/if_spppsubr.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.267.4.1 2023/11/15 02:08:34 thorpej Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.267.4.2 2023/11/16 04:30:22 thorpej Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.267.4.1 2023/11/15 02:08:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.267.4.2 2023/11/16 04:30:22 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -852,7 +852,7 @@ sppp_output(struct ifnet *ifp, struct mb
* If the queueing discipline needs packet classification,
* do it before prepending link headers.
*/
- IFQ_CLASSIFY(&ifp->if_snd, m, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m, dst->sa_family);
#ifdef INET
if (dst->sa_family == AF_INET) {
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.173 src/sys/net/if_tun.c:1.173.8.1
--- src/sys/net/if_tun.c:1.173 Mon Mar 28 12:33:22 2022
+++ src/sys/net/if_tun.c Thu Nov 16 04:30:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.173 2022/03/28 12:33:22 riastradh Exp $ */
+/* $NetBSD: if_tun.c,v 1.173.8.1 2023/11/16 04:30:22 thorpej Exp $ */
/*
* Copyright (c) 1988, Julian Onions <j...@cs.nott.ac.uk>
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.173 2022/03/28 12:33:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.173.8.1 2023/11/16 04:30:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -578,7 +578,7 @@ tun_output(struct ifnet *ifp, struct mbu
* if the queueing discipline needs packet classification,
* do it before prepending link headers.
*/
- IFQ_CLASSIFY(&ifp->if_snd, m0, dst->sa_family);
+ ifq_classify_packet(&ifp->if_snd, m0, dst->sa_family);
bpf_mtap_af(ifp, dst->sa_family, m0, BPF_D_OUT);
