summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/usb/if_aue.c4
-rw-r--r--sys/dev/usb/if_axe.c4
-rw-r--r--sys/dev/usb/if_cdce.c4
-rw-r--r--sys/dev/usb/if_cdcef.c4
-rw-r--r--sys/dev/usb/if_cue.c4
-rw-r--r--sys/dev/usb/if_kue.c4
-rw-r--r--sys/dev/usb/if_udav.c4
-rw-r--r--sys/dev/usb/if_upl.c4
-rw-r--r--sys/dev/usb/if_url.c4
-rw-r--r--sys/dev/usb/usb_port.h4
10 files changed, 19 insertions, 21 deletions
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 56a792371c5..93f4c10a9b0 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_aue.c,v 1.63 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_aue.c,v 1.64 2007/06/13 11:15:29 mbalmer Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -1122,7 +1122,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
DPRINTFN(10,("%s: %s: deliver %d\n", sc->aue_dev.dv_xname,
__func__, m->m_len));
- IF_INPUT(ifp, m);
+ ether_input_mbuf(ifp, m);
done1:
splx(s);
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 79aab852469..58a05abcc4f 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_axe.c,v 1.76 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_axe.c,v 1.77 2007/06/13 11:15:29 mbalmer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -988,7 +988,7 @@ axe_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN);
#endif
- IF_INPUT(ifp, m);
+ ether_input_mbuf(ifp, m);
splx(s);
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index e96a5d0530b..016154236fe 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cdce.c,v 1.31 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_cdce.c,v 1.32 2007/06/13 11:15:29 mbalmer Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -698,7 +698,7 @@ cdce_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN);
#endif
- IF_INPUT(ifp, m);
+ ether_input_mbuf(ifp, m);
done1:
splx(s);
diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c
index 4d3a50421e9..6208822e270 100644
--- a/sys/dev/usb/if_cdcef.c
+++ b/sys/dev/usb/if_cdcef.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cdcef.c,v 1.15 2007/06/10 14:49:00 mbalmer Exp $ */
+/* $OpenBSD: if_cdcef.c,v 1.16 2007/06/13 11:15:29 mbalmer Exp $ */
/*
* Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
@@ -434,7 +434,7 @@ cdcef_rxeof(usbf_xfer_handle xfer, usbf_private_handle priv,
bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN);
#endif
- IF_INPUT(ifp, m);
+ ether_input_mbuf(ifp, m);
}
done1:
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 350d99f4d6e..ef723afd152 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cue.c,v 1.42 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_cue.c,v 1.43 2007/06/13 11:15:29 mbalmer Exp $ */
/* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -777,7 +777,7 @@ cue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
DPRINTFN(10,("%s: %s: deliver %d\n", sc->cue_dev.dv_xname,
__func__, m->m_len));
- IF_INPUT(ifp, m);
+ ether_input_mbuf(ifp, m);
done1:
splx(s);
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 42cb784e98a..bdbc0d78687 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_kue.c,v 1.53 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_kue.c,v 1.54 2007/06/13 11:15:29 mbalmer Exp $ */
/* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -778,7 +778,7 @@ kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
DPRINTFN(10,("%s: %s: deliver %d\n", sc->kue_dev.dv_xname,
__func__, m->m_len));
- IF_INPUT(ifp, m);
+ ether_input_mbuf(ifp, m);
done1:
splx(s);
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 6957c9dd3b7..de2fa288224 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_udav.c,v 1.32 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_udav.c,v 1.33 2007/06/13 11:15:29 mbalmer Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -1165,7 +1165,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
DPRINTF(("%s: %s: deliver %d\n", sc->sc_dev.dv_xname,
__func__, m->m_len));
- IF_INPUT(ifp, m);
+ ether_input_mbuf(ifp, m);
done1:
splx(s);
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index f7103f2a1c3..374d41fe357 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.36 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_upl.c,v 1.37 2007/06/13 11:15:29 mbalmer Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -540,7 +540,7 @@ upl_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
DPRINTFN(10,("%s: %s: deliver %d\n", sc->sc_dev.dv_xname,
__func__, m->m_len));
- IF_INPUT(ifp, m);
+ ether_input_mbuf(ifp, m);
done1:
splx(s);
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index c94e0bdc64c..447652fb82b 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_url.c,v 1.46 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_url.c,v 1.47 2007/06/13 11:15:29 mbalmer Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -1052,7 +1052,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
DPRINTF(("%s: %s: deliver %d\n", sc->sc_dev.dv_xname,
__func__, m->m_len));
- IF_INPUT(ifp, m);
+ ether_input_mbuf(ifp, m);
done1:
splx(s);
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index ff7c3187f76..776de752a8f 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_port.h,v 1.88 2007/06/13 10:33:52 mbalmer Exp $ */
+/* $OpenBSD: usb_port.h,v 1.89 2007/06/13 11:15:29 mbalmer Exp $ */
/* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -61,8 +61,6 @@
#define mstohz(ms) ((ms) * hz / 1000)
-#define IF_INPUT(ifp, m) ether_input_mbuf((ifp), (m))
-
#define DECLARE_USB_DMA_T \
struct usb_dma_block; \
typedef struct { \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 17:50:43 +0000