Make all Ethernet drivers attach using ether_ifattach() and detach using

ether_ifdetach().

The former consolidates the operations of if_attach(), ng_ether_attach(),
and bpfattach(). The latter consolidates the corresponding detach operations.

Reviewed by:	julian, freebsd-net

1 files changed, 2 insertions, 6 deletions

diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index dc25317..7cbe32d 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -550,12 +550,9 @@ epic_freebsd_attach(dev)
 	printf ("\n");
 
 	/* Attach to OS's managers */
-	if_attach(ifp);
-	ether_ifattach(ifp);
+	ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
 	callout_handle_init(&sc->stat_ch);
 
-	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
-
 fail:
 	splx(s);
 
@@ -578,8 +575,7 @@ epic_freebsd_detach(dev)
 	sc = device_get_softc(dev);
 	ifp = &sc->arpcom.ac_if;
 
-	bpfdetach(ifp);
-	if_detach(ifp);
+	ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
 
 	epic_stop(sc);