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, 5 deletions

diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 5a73a67..79883cc 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -2849,14 +2849,13 @@ fe_attach ( struct isa_device * dev )
 	/* Attach and stop the interface. */
 #if NCARD > 0
 	if (already_ifattach[dev->id_unit] != 1) {
-		if_attach(&sc->sc_if);
+		ether_ifattach(&sc->sc_if, ETHER_BPF_SUPPORTED);
 		already_ifattach[dev->id_unit] = 1;
 	}
 #else
-	if_attach(&sc->sc_if);
+	ether_ifattach(&sc->sc_if, ETHER_BPF_SUPPORTED);
 #endif
 	fe_stop(sc);
- 	ether_ifattach(&sc->sc_if);
   
   	/* Print additional info when attached.  */
  	printf("fe%d: address %6D, type %s%s\n", sc->sc_unit,
@@ -2905,8 +2904,6 @@ fe_attach ( struct isa_device * dev )
 		       sc->sc_unit);
 	}
 
-	/* If BPF is in the kernel, call the attach for it.  */
- 	bpfattach(&sc->sc_if, DLT_EN10MB, sizeof(struct ether_header));
 	return 1;
 }