summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/if_upl.c4
-rw-r--r--sys/net/bridgestp.c6
-rw-r--r--sys/net/if.c4
-rw-r--r--sys/net/if_bridge.c4
-rw-r--r--sys/net/if_ethersubr.c4
-rw-r--r--sys/net/if_gif.c4
-rw-r--r--sys/net/if_mpe.c4
-rw-r--r--sys/net/if_pppx.c4
-rw-r--r--sys/net/if_spppsubr.c4
-rw-r--r--sys/net/if_trunk.c18
-rw-r--r--sys/net/if_tun.c4
-rw-r--r--sys/net/if_var.h4
-rw-r--r--sys/net/if_vlan.c4
-rw-r--r--sys/net/trunklacp.c8
-rw-r--r--sys/net80211/ieee80211_input.c4
-rw-r--r--sys/net80211/ieee80211_output.c4
-rw-r--r--sys/netinet/ip_carp.c4
17 files changed, 42 insertions, 46 deletions
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 429fa99089c..87b37296e9c 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_upl.c,v 1.66 2015/06/24 09:40:54 mpi Exp $ */
+/* $OpenBSD: if_upl.c,v 1.67 2015/06/30 13:54:42 mpi Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -887,5 +887,5 @@ int
upl_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
struct rtentry *rt0)
{
- return (if_output(ifp, m));
+ return (if_enqueue(ifp, m));
}
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 0318144d0a2..9bb4685f12c 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bridgestp.c,v 1.56 2015/06/16 11:09:39 mpi Exp $ */
+/* $OpenBSD: bridgestp.c,v 1.57 2015/06/30 13:54:42 mpi Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -378,7 +378,7 @@ bstp_transmit_tcn(struct bstp_state *bs, struct bstp_port *bp)
bcopy(&bpdu, mtod(m, caddr_t) + sizeof(*eh), sizeof(bpdu));
bp->bp_txcount++;
- if_output(ifp, m);
+ if_enqueue(ifp, m);
}
void
@@ -508,7 +508,7 @@ bstp_send_bpdu(struct bstp_state *bs, struct bstp_port *bp,
m->m_pkthdr.pf.prio = BSTP_IFQ_PRIO;
bp->bp_txcount++;
- if_output(ifp, m);
+ if_enqueue(ifp, m);
done:
splx(s);
}
diff --git a/sys/net/if.c b/sys/net/if.c
index 63af716aa7e..fe578fe0a86 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.346 2015/06/29 10:32:29 dlg Exp $ */
+/* $OpenBSD: if.c,v 1.347 2015/06/30 13:54:42 mpi Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -442,7 +442,7 @@ if_start(struct ifnet *ifp)
}
int
-if_output(struct ifnet *ifp, struct mbuf *m)
+if_enqueue(struct ifnet *ifp, struct mbuf *m)
{
int s, length, error = 0;
unsigned short mflags;
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 902726f22d4..18e682d7e34 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.249 2015/06/30 09:13:53 mpi Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.250 2015/06/30 13:54:42 mpi Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -2566,7 +2566,7 @@ bridge_ifenqueue(struct bridge_softc *sc, struct ifnet *ifp, struct mbuf *m)
#endif
len = m->m_pkthdr.len;
- error = if_output(ifp, m);
+ error = if_enqueue(ifp, m);
if (error) {
sc->sc_if.if_oerrors++;
return (error);
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 5cbd6a62255..0f5b66ae9a7 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.211 2015/06/29 10:32:29 dlg Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.212 2015/06/30 13:54:42 mpi Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -263,7 +263,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
memcpy(eh->ether_dhost, edst, sizeof(eh->ether_dhost));
memcpy(eh->ether_shost, esrc, sizeof(eh->ether_shost));
- return (if_output(ifp, m));
+ return (if_enqueue(ifp, m));
bad:
if (m)
m_freem(m);
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 3c70d959dca..b3d56264d84 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gif.c,v 1.74 2015/05/15 10:15:13 mpi Exp $ */
+/* $OpenBSD: if_gif.c,v 1.75 2015/06/30 13:54:42 mpi Exp $ */
/* $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */
/*
@@ -315,7 +315,7 @@ gif_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
if ((error = gif_checkloop(ifp, m)))
goto end;
- error = if_output(ifp, m);
+ error = if_enqueue(ifp, m);
end:
if (error)
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index 9565273ba3e..689b3543712 100644
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpe.c,v 1.45 2015/06/16 11:09:39 mpi Exp $ */
+/* $OpenBSD: if_mpe.c,v 1.46 2015/06/30 13:54:42 mpi Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -256,7 +256,7 @@ mpeoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
m_copyback(m, off, sizeof(shim), (caddr_t)&shim, M_NOWAIT);
- error = if_output(ifp, m);
+ error = if_enqueue(ifp, m);
out:
if (error)
ifp->if_oerrors++;
diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index eb4d0f15109..1f7489a4efd 100644
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppx.c,v 1.38 2015/05/15 10:15:13 mpi Exp $ */
+/* $OpenBSD: if_pppx.c,v 1.39 2015/06/30 13:54:42 mpi Exp $ */
/*
* Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -1059,7 +1059,7 @@ pppx_if_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
}
*mtod(m, int *) = proto;
- error = if_output(ifp, m);
+ error = if_enqueue(ifp, m);
out:
if (error)
ifp->if_oerrors++;
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 145805319ff..b6f94f95bf9 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_spppsubr.c,v 1.134 2015/06/16 11:09:39 mpi Exp $ */
+/* $OpenBSD: if_spppsubr.c,v 1.135 2015/06/30 13:54:42 mpi Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
* Keepalive protocol implemented in both Cisco and PPP modes.
@@ -788,7 +788,7 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
* Queue message on interface, and start output if interface
* not yet active.
*/
- rv = if_output(ifp, m);
+ rv = if_enqueue(ifp, m);
if (rv != 0) {
ifp->if_oerrors++;
return (rv);
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index 8b66134e599..bc93e24ac02 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_trunk.c,v 1.105 2015/06/29 10:32:29 dlg Exp $ */
+/* $OpenBSD: if_trunk.c,v 1.106 2015/06/30 13:54:42 mpi Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -1299,8 +1299,7 @@ trunk_rr_start(struct trunk_softc *tr, struct mbuf *m)
return (ENOENT);
}
- /* Send mbuf */
- if ((error = if_output(tp->tp_if, m)) != 0)
+ if ((error = if_enqueue(tp->tp_if, m)) != 0)
return (error);
/* Get next active port */
@@ -1355,8 +1354,7 @@ trunk_fail_start(struct trunk_softc *tr, struct mbuf *m)
return (ENOENT);
}
- /* Send mbuf */
- return (if_output(tp->tp_if, m));
+ return (if_enqueue(tp->tp_if, m));
}
int
@@ -1477,8 +1475,7 @@ trunk_lb_start(struct trunk_softc *tr, struct mbuf *m)
return (ENOENT);
}
- /* Send mbuf */
- return (if_output(tp->tp_if, m));
+ return (if_enqueue(tp->tp_if, m));
}
int
@@ -1538,7 +1535,7 @@ trunk_bcast_start(struct trunk_softc *tr, struct mbuf *m0)
break;
}
- ret = if_output(last->tp_if, m);
+ ret = if_enqueue(last->tp_if, m);
if (ret != 0)
errors++;
}
@@ -1549,7 +1546,7 @@ trunk_bcast_start(struct trunk_softc *tr, struct mbuf *m0)
return (ENOENT);
}
- ret = if_output(last->tp_if, m0);
+ ret = if_enqueue(last->tp_if, m0);
if (ret != 0)
errors++;
@@ -1622,8 +1619,7 @@ trunk_lacp_start(struct trunk_softc *tr, struct mbuf *m)
return (EBUSY);
}
- /* Send mbuf */
- return (if_output(tp->tp_if, m));
+ return (if_enqueue(tp->tp_if, m));
}
int
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 70a9df3f289..fda61c28503 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tun.c,v 1.147 2015/06/24 09:40:54 mpi Exp $ */
+/* $OpenBSD: if_tun.c,v 1.148 2015/06/30 13:54:42 mpi Exp $ */
/* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */
/*
@@ -569,7 +569,7 @@ tun_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
}
#endif
- error = if_output(ifp, m0);
+ error = if_enqueue(ifp, m0);
splx(s);
if (error) {
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index bef4cede43c..7a764b632c8 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_var.h,v 1.32 2015/06/02 13:23:55 mpi Exp $ */
+/* $OpenBSD: if_var.h,v 1.33 2015/06/30 13:54:42 mpi Exp $ */
/* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */
/*
@@ -410,7 +410,7 @@ extern struct ifnet_head ifnet;
extern struct ifnet *lo0ifp;
void if_start(struct ifnet *);
-int if_output(struct ifnet *, struct mbuf *);
+int if_enqueue(struct ifnet *, struct mbuf *);
void if_input(struct ifnet *, struct mbuf_list *);
void ether_ifattach(struct ifnet *);
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 3f039686af6..686951ef5e3 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vlan.c,v 1.132 2015/06/29 10:32:29 dlg Exp $ */
+/* $OpenBSD: if_vlan.c,v 1.133 2015/06/30 13:54:42 mpi Exp $ */
/*
* Copyright 1998 Massachusetts Institute of Technology
@@ -231,7 +231,7 @@ vlan_start(struct ifnet *ifp)
m->m_flags &= ~M_VLANTAG;
}
- if (if_output(p, m)) {
+ if (if_enqueue(p, m)) {
ifp->if_oerrors++;
continue;
}
diff --git a/sys/net/trunklacp.c b/sys/net/trunklacp.c
index 2a31254b57e..a7a0c035e2d 100644
--- a/sys/net/trunklacp.c
+++ b/sys/net/trunklacp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trunklacp.c,v 1.23 2015/06/10 09:20:21 mpi Exp $ */
+/* $OpenBSD: trunklacp.c,v 1.24 2015/06/30 13:54:42 mpi Exp $ */
/* $NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */
/* $FreeBSD:ieee8023ad_lacp.c,v 1.15 2008/03/16 19:25:30 thompsa Exp $ */
@@ -393,7 +393,7 @@ lacp_xmit_lacpdu(struct lacp_port *lp)
* XXX should use higher priority queue.
* otherwise network congestion can break aggregation.
*/
- error = if_output(lp->lp_ifp, m);
+ error = if_enqueue(lp->lp_ifp, m);
return (error);
}
@@ -433,7 +433,7 @@ lacp_xmit_marker(struct lacp_port *lp)
ntohl(mdu->mdu_info.mi_rq_xid)));
m->m_flags |= M_MCAST;
- error = if_output(lp->lp_ifp, m);
+ error = if_enqueue(lp->lp_ifp, m);
return (error);
}
@@ -1659,7 +1659,7 @@ lacp_marker_input(struct lacp_port *lp, struct mbuf *m)
&ethermulticastaddr_slowprotocols, ETHER_ADDR_LEN);
memcpy(&mdu->mdu_eh.ether_shost,
tp->tp_lladdr, ETHER_ADDR_LEN);
- error = if_output(lp->lp_ifp, m);
+ error = if_enqueue(lp->lp_ifp, m);
break;
case MARKER_TYPE_RESPONSE:
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index f1d539b9028..72c5a8ac366 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_input.c,v 1.135 2015/06/24 09:40:54 mpi Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.136 2015/06/30 13:54:42 mpi Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
@@ -842,7 +842,7 @@ ieee80211_deliver_data(struct ieee80211com *ic, struct mbuf *m,
}
}
if (m1 != NULL) {
- if (if_output(ifp, m1))
+ if (if_enqueue(ifp, m1))
ifp->if_oerrors++;
}
}
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 82bd609d2e5..a8adbde2a5a 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_output.c,v 1.95 2015/05/26 15:34:00 mpi Exp $ */
+/* $OpenBSD: ieee80211_output.c,v 1.96 2015/06/30 13:54:42 mpi Exp $ */
/* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */
/*-
@@ -142,7 +142,7 @@ ieee80211_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
IEEE80211_FC0_TYPE_CTL)
return (EINVAL);
- return (if_output(ifp, m));
+ return (if_enqueue(ifp, m));
}
fallback:
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 546712c7d04..d5c7a55e8e3 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.262 2015/06/29 10:32:29 dlg Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.263 2015/06/30 13:54:42 mpi Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -2304,7 +2304,7 @@ carp_start(struct ifnet *ifp)
memcpy(eh->ether_shost, esrc, sizeof(eh->ether_shost));
}
- if (if_output(ifp->if_carpdev, m)) {
+ if (if_enqueue(ifp->if_carpdev, m)) {
ifp->if_oerrors++;
continue;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 04:41:28 +0000