Remove Ether_ifattach macro

9 files changed, 17 insertions, 18 deletions

diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 00a5833b376..5da8c137141 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.52 2007/05/06 04:08:47 krw Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.53 2007/05/21 05:18:56 jsg Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -837,7 +837,7 @@ USB_ATTACH(aue)
 
 	/* Attach the interface. */
 	if_attach(ifp);
-	Ether_ifattach(ifp, eaddr);
+	ether_ifattach(ifp);
 
 	usb_callout_init(sc->aue_stat_ch);
 
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 132c9a955a4..ff4de91988c 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.66 2007/05/14 00:46:21 jsg Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.67 2007/05/21 05:18:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -709,7 +709,7 @@ USB_ATTACH(axe)
 
 	/* Attach the interface. */
 	if_attach(ifp);
-	Ether_ifattach(ifp, eaddr);
+	ether_ifattach(ifp);
 
 	usb_callout_init(sc->axe_stat_ch);
 
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index f4ca6808023..4d806bc9168 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.24 2007/04/05 02:32:45 tedu Exp $ */
+/*	$OpenBSD: if_cdce.c,v 1.25 2007/05/21 05:18:56 jsg Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -257,7 +257,7 @@ USB_ATTACH(cdce)
 	IFQ_SET_READY(&ifp->if_snd);
 
 	if_attach(ifp);
-	Ether_ifattach(ifp, sc->cdce_arpcom.ac_enaddr);
+	ether_ifattach(ifp);
 
 	sc->cdce_attached = 1;
 	splx(s);
diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c
index 846e5ee7625..06e930e059d 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.11 2007/02/26 19:24:27 ckuethe Exp $	*/
+/*	$OpenBSD: if_cdcef.c,v 1.12 2007/05/21 05:18:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
@@ -261,7 +261,7 @@ USB_ATTACH(cdcef)
 	IFQ_SET_READY(&ifp->if_snd);
 
 	if_attach(ifp);
-	Ether_ifattach(ifp, sc->cdcef_arpcom.ac_enaddr);
+	ether_ifattach(ifp);
 
 	sc->sc_attached = 1;
 	splx(s);
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 31d10e658af..4b986024bde 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.32 2007/02/11 20:29:22 miod Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.33 2007/05/21 05:18:56 jsg Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -546,7 +546,7 @@ USB_ATTACH(cue)
 
 	/* Attach the interface. */
 	if_attach(ifp);
-	Ether_ifattach(ifp, eaddr);
+	ether_ifattach(ifp);
 
 	usb_callout_init(sc->cue_stat_ch);
 
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index c7259f69dc9..3063b4b90e2 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.44 2007/02/11 20:29:22 miod Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.45 2007/05/21 05:18:56 jsg Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -511,7 +511,7 @@ kue_attachhook(void *xsc)
 
 	/* Attach the interface. */
 	if_attach(ifp);
-	Ether_ifattach(ifp, sc->kue_desc.kue_macaddr);
+	ether_ifattach(ifp);
 
 	sc->kue_attached = 1;
 	splx(s);
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index e01014b56ef..53baadcfa4f 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.22 2007/05/06 04:08:47 krw Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.23 2007/05/21 05:18:56 jsg 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 $	*/
 /*
@@ -287,7 +287,7 @@ USB_ATTACH(udav)
 
 	/* attach the interface */
 	if_attach(ifp);
-	Ether_ifattach(ifp, eaddr);
+	ether_ifattach(ifp);
 
 	usb_callout_init(sc->sc_stat_ch);
 	sc->sc_attached = 1;
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 143bfd12ff5..c9d0b36a895 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.35 2007/05/06 04:08:47 krw Exp $ */
+/*	$OpenBSD: if_url.c,v 1.36 2007/05/21 05:18:56 jsg Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -314,7 +314,7 @@ USB_ATTACH(url)
 
 	/* attach the interface */
 	if_attach(ifp);
-	Ether_ifattach(ifp, eaddr);
+	ether_ifattach(ifp);
 
 	usb_callout_init(sc->sc_stat_ch);
 	sc->sc_attached = 1;
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 29a46411183..fe2745831e6 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.64 2007/05/21 05:03:45 jsg Exp $ */
+/*	$OpenBSD: usb_port.h,v 1.65 2007/05/21 05:18:56 jsg 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 $	*/
 
@@ -118,7 +118,6 @@ typedef struct proc *usb_proc_ptr;
 
 typedef int usb_malloc_type;
 
-#define Ether_ifattach(ifp, eaddr) ether_ifattach(ifp)
 #define if_deactivate(x)
 #define IF_INPUT(ifp, m) ether_input_mbuf((ifp), (m))