From: Aggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Date: Thu, 9 Jul 2009 00:32:00 +0000 (+0300)
Subject: get mxge to build, stage 23/many
X-Git-Tag: v2.3.2~4^2~20
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/cf774bce7115a873dcb229b6286cb64a8f1a028c

get mxge to build, stage 23/many

- no need to free the ifnet, it's part of the softc in dragonfly
- convert ether_ifattach()
---

diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c
index 4a39374ebe..46fc953f5e 100644
--- a/sys/dev/netif/mxge/if_mxge.c
+++ b/sys/dev/netif/mxge/if_mxge.c
@@ -4604,7 +4604,7 @@ mxge_attach(device_t dev)
 	mxge_set_media(sc, IFM_ETHER | IFM_AUTO);
 	mxge_media_probe(sc);
 	sc->dying = 0;
-	ether_ifattach(ifp, sc->mac_addr);
+	ether_ifattach(ifp, sc->mac_addr, NULL);
 	/* ether_ifattach sets mtu to ETHERMTU */
 	if (mxge_initial_mtu != ETHERMTU)
 		mxge_change_mtu(sc, mxge_initial_mtu);
@@ -4632,10 +4632,7 @@ abort_with_lock:
 	pci_disable_busmaster(dev);
 	lockuninit(&sc->cmd_lock);
 	lockuninit(&sc->driver_lock);
-	if_free(ifp);
-abort_with_parent_dmat:
 	bus_dma_tag_destroy(sc->parent_dmat);
-
 abort_with_nothing:
 	return err;
 }
@@ -4670,7 +4667,6 @@ mxge_detach(device_t dev)
 	pci_disable_busmaster(dev);
 	lockuninit(&sc->cmd_lock);
 	lockuninit(&sc->driver_lock);
-	if_free(sc->ifp);
 	bus_dma_tag_destroy(sc->parent_dmat);
 	return 0;
 }