Module Name: src
Committed By: thorpej
Date: Wed Nov 15 02:08:34 UTC 2023
Modified Files:
src/sys/dev/pci [thorpej-ifq]: xmm7360.c
src/sys/dev/usb [thorpej-ifq]: uhso.c
src/sys/net [thorpej-ifq]: if.c if.h if_arcsubr.c if_ethersubr.c
if_ppp.c if_sl.c if_spppsubr.c
src/sys/netcan [thorpej-ifq]: can.c
Log Message:
Rename ifq_enqueue() -> if_enqueue(), ifq_enqueue2() -> if_enqueue2().
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.6.1 src/sys/dev/pci/xmm7360.c
cvs rdiff -u -r1.37 -r1.37.6.1 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.529.2.1.2.1 -r1.529.2.1.2.2 src/sys/net/if.c
cvs rdiff -u -r1.305.2.1.2.1 -r1.305.2.1.2.2 src/sys/net/if.h
cvs rdiff -u -r1.85 -r1.85.8.1 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.326.2.1 -r1.326.2.1.2.1 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.172 -r1.172.8.1 src/sys/net/if_ppp.c
cvs rdiff -u -r1.136 -r1.136.6.1 src/sys/net/if_sl.c
cvs rdiff -u -r1.267 -r1.267.4.1 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.13 -r1.13.6.1 src/sys/netcan/can.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/pci/xmm7360.c
diff -u src/sys/dev/pci/xmm7360.c:1.17 src/sys/dev/pci/xmm7360.c:1.17.6.1
--- src/sys/dev/pci/xmm7360.c:1.17 Thu Oct 27 00:01:07 2022
+++ src/sys/dev/pci/xmm7360.c Wed Nov 15 02:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: xmm7360.c,v 1.17 2022/10/27 00:01:07 riastradh Exp $ */
+/* $NetBSD: xmm7360.c,v 1.17.6.1 2023/11/15 02:08:33 thorpej Exp $ */
/*
* Device driver for Intel XMM7360 LTE modems, eg. Fibocom L850-GL.
@@ -75,7 +75,7 @@ MODULE_DEVICE_TABLE(pci, xmm7360_ids);
#include "opt_gateway.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.17 2022/10/27 00:01:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.17.6.1 2023/11/15 02:08:33 thorpej Exp $");
#endif
#include <sys/param.h>
@@ -257,7 +257,6 @@ typedef struct kmutex spinlock_t;
#define ifq_clr_oactive(ifq) /* nothing to do */
#define ifq_empty(ifq) IFQ_IS_EMPTY(ifq)
#define ifq_purge(ifq) IF_PURGE(ifq)
-#define if_enqueue(ifp, m) ifq_enqueue(ifp, m)
#define if_ih_insert(ifp, func, arg) (ifp)->_if_input = (func)
#define if_ih_remove(ifp, func, arg) /* nothing to do */
#define if_hardmtu if_mtu
Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.37 src/sys/dev/usb/uhso.c:1.37.6.1
--- src/sys/dev/usb/uhso.c:1.37 Wed Oct 26 23:53:03 2022
+++ src/sys/dev/usb/uhso.c Wed Nov 15 02:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.37 2022/10/26 23:53:03 riastradh Exp $ */
+/* $NetBSD: uhso.c,v 1.37.6.1 2023/11/15 02:08:33 thorpej Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.37 2022/10/26 23:53:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.37.6.1 2023/11/15 02:08:33 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2358,7 +2358,7 @@ uhso_ifnet_output(struct ifnet *ifp, str
switch (dst->sa_family) {
#ifdef INET
case AF_INET:
- error = ifq_enqueue(ifp, m);
+ error = if_enqueue(ifp, m);
break;
#endif
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.529.2.1.2.1 src/sys/net/if.c:1.529.2.1.2.2
--- src/sys/net/if.c:1.529.2.1.2.1 Tue Nov 14 14:47:03 2023
+++ src/sys/net/if.c Wed Nov 15 02:08:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.529.2.1.2.1 2023/11/14 14:47:03 thorpej Exp $ */
+/* $NetBSD: if.c,v 1.529.2.1.2.2 2023/11/15 02:08:33 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008, 2023 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.529.2.1.2.1 2023/11/14 14:47:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.529.2.1.2.2 2023/11/15 02:08:33 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -4415,11 +4415,9 @@ ifq_classify_packet(struct ifqueue * con
/*
* Queue message on interface, and start output if interface
* not yet active.
- *
- * XXX Should be renamed if_enqueue().
*/
int
-ifq_enqueue(struct ifnet *ifp, struct mbuf *m)
+if_enqueue(struct ifnet *ifp, struct mbuf *m)
{
return if_transmit_lock(ifp, m);
@@ -4445,11 +4443,9 @@ ifq_lock2(struct ifqueue * const ifq0, s
*
* N.B. Unlike ifq_enqueue(), this does *not* start transmission on
* the interface.
- *
- * XXX Should be renamed if_enqueue2().
*/
int
-ifq_enqueue2(struct ifnet *ifp, struct ifqueue *ifq, struct mbuf *m)
+if_enqueue2(struct ifnet *ifp, struct ifqueue *ifq, struct mbuf *m)
{
struct ifqueue * const ifq0 = &ifp->if_snd;
int error = 0;
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.305.2.1.2.1 src/sys/net/if.h:1.305.2.1.2.2
--- src/sys/net/if.h:1.305.2.1.2.1 Tue Nov 14 14:47:03 2023
+++ src/sys/net/if.h Wed Nov 15 02:08:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.305.2.1.2.1 2023/11/14 14:47:03 thorpej Exp $ */
+/* $NetBSD: if.h,v 1.305.2.1.2.2 2023/11/15 02:08:34 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2023 The NetBSD Foundation, Inc.
@@ -1352,8 +1352,8 @@ void if_clone_detach(struct if_clone *);
int if_transmit_lock(struct ifnet *, struct mbuf *);
-int ifq_enqueue(struct ifnet *, struct mbuf *);
-int ifq_enqueue2(struct ifnet *, struct ifqueue *, struct mbuf *);
+int if_enqueue(struct ifnet *, struct mbuf *);
+int if_enqueue2(struct ifnet *, struct ifqueue *, struct mbuf *);
int loioctl(struct ifnet *, u_long, void *);
void loopattach(int);
Index: src/sys/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.85 src/sys/net/if_arcsubr.c:1.85.8.1
--- src/sys/net/if_arcsubr.c:1.85 Sat Sep 3 02:47:59 2022
+++ src/sys/net/if_arcsubr.c Wed Nov 15 02:08:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.85 2022/09/03 02:47:59 thorpej Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.85.8.1 2023/11/15 02:08:34 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 2022/09/03 02:47:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.85.8.1 2023/11/15 02:08:34 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -278,7 +278,7 @@ arc_output(struct ifnet *ifp, struct mbu
ah->arc_flag = rsflag;
ah->arc_seqid = ac->ac_seqid;
- if ((error = ifq_enqueue(ifp, m)) != 0)
+ if ((error = if_enqueue(ifp, m)) != 0)
return (error);
m = m1;
@@ -326,7 +326,7 @@ arc_output(struct ifnet *ifp, struct mbu
ah->arc_shost = myself;
}
- return ifq_enqueue(ifp, m);
+ return if_enqueue(ifp, m);
bad:
if (m1)
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.326.2.1 src/sys/net/if_ethersubr.c:1.326.2.1.2.1
--- src/sys/net/if_ethersubr.c:1.326.2.1 Sat Nov 11 13:16:30 2023
+++ src/sys/net/if_ethersubr.c Wed Nov 15 02:08:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.326.2.1 2023/11/11 13:16:30 thorpej Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.326.2.1.2.1 2023/11/15 02:08:34 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.326.2.1 2023/11/11 13:16:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.326.2.1.2.1 2023/11/15 02:08:34 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -458,7 +458,7 @@ ether_output(struct ifnet * const ifp0,
altq_etherclassify(ifp->if_snd.ifq_altq, m);
KERNEL_UNLOCK_ONE(NULL);
#endif
- return ifq_enqueue(ifp, m);
+ return if_enqueue(ifp, m);
bad:
if_statinc(ifp, if_oerrors);
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.172 src/sys/net/if_ppp.c:1.172.8.1
--- src/sys/net/if_ppp.c:1.172 Sat Sep 3 02:47:59 2022
+++ src/sys/net/if_ppp.c Wed Nov 15 02:08:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.172 2022/09/03 02:47:59 thorpej Exp $ */
+/* $NetBSD: if_ppp.c,v 1.172.8.1 2023/11/15 02:08:34 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 2022/09/03 02:47:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.172.8.1 2023/11/15 02:08:34 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -1019,7 +1019,7 @@ pppoutput(struct ifnet *ifp, struct mbuf
sc->sc_npqtail = &m0->m_nextpkt;
} else {
ifq = (m0->m_flags & M_HIGHPRI) ? &sc->sc_fastq : NULL;
- if ((error = ifq_enqueue2(&sc->sc_if, ifq, m0)) != 0) {
+ if ((error = if_enqueue2(&sc->sc_if, ifq, m0)) != 0) {
splx(s);
if_statinc(&sc->sc_if, if_oerrors);
sc->sc_stats.ppp_oerrors++;
@@ -1071,7 +1071,7 @@ ppp_requeue(struct ppp_softc *sc)
*mpp = m->m_nextpkt;
m->m_nextpkt = NULL;
ifq = (m->m_flags & M_HIGHPRI) ? &sc->sc_fastq : NULL;
- if ((error = ifq_enqueue2(&sc->sc_if, ifq, m)) != 0) {
+ if ((error = if_enqueue2(&sc->sc_if, ifq, m)) != 0) {
if_statinc(&sc->sc_if, if_oerrors);
sc->sc_stats.ppp_oerrors++;
}
Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.136 src/sys/net/if_sl.c:1.136.6.1
--- src/sys/net/if_sl.c:1.136 Wed Oct 26 23:42:42 2022
+++ src/sys/net/if_sl.c Wed Nov 15 02:08:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sl.c,v 1.136 2022/10/26 23:42:42 riastradh Exp $ */
+/* $NetBSD: if_sl.c,v 1.136.6.1 2023/11/15 02:08:34 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 2022/10/26 23:42:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.136.6.1 2023/11/15 02:08:34 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -528,7 +528,7 @@ sloutput(struct ifnet *ifp, struct mbuf
if ((ip->ip_tos & IPTOS_LOWDELAY) != 0)
ifq = &sc->sc_fastq;
#endif
- if ((error = ifq_enqueue2(ifp, ifq, m)) != 0) {
+ if ((error = if_enqueue2(ifp, ifq, m)) != 0) {
splx(s);
return error;
}
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.267 src/sys/net/if_spppsubr.c:1.267.4.1
--- src/sys/net/if_spppsubr.c:1.267 Sat Mar 25 21:35:49 2023
+++ src/sys/net/if_spppsubr.c Wed Nov 15 02:08:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.267 2023/03/25 21:35:49 andvar Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.267.4.1 2023/11/15 02:08:34 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 2023/03/25 21:35:49 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.267.4.1 2023/11/15 02:08:34 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -1023,7 +1023,7 @@ sppp_output(struct ifnet *ifp, struct mb
if (error == 0)
if_statadd(ifp, if_obytes, pktlen + sp->pp_framebytes);
#else /* !SPPPSUBR_MPSAFE */
- error = ifq_enqueue2(ifp, ifq, m);
+ error = if_enqueue2(ifp, ifq, m);
if (error == 0) {
/*
Index: src/sys/netcan/can.c
diff -u src/sys/netcan/can.c:1.13 src/sys/netcan/can.c:1.13.6.1
--- src/sys/netcan/can.c:1.13 Fri Nov 4 09:00:58 2022
+++ src/sys/netcan/can.c Wed Nov 15 02:08:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: can.c,v 1.13 2022/11/04 09:00:58 ozaki-r Exp $ */
+/* $NetBSD: can.c,v 1.13.6.1 2023/11/15 02:08:34 thorpej Exp $ */
/*-
* Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.13 2022/11/04 09:00:58 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.13.6.1 2023/11/15 02:08:34 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -263,7 +263,7 @@ can_output(struct mbuf *m, struct canpcb
if (m->m_len <= ifp->if_mtu) {
can_output_cnt++;
- return ifq_enqueue(ifp, m);
+ return if_enqueue(ifp, m);
} else
return EMSGSIZE;
}
