Deleted Added
full compact
if_vge.c (150215) if_vge.c (150306)
1/*-
2 * Copyright (c) 2004
3 * Bill Paul <wpaul@windriver.com>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2004
3 * Bill Paul <wpaul@windriver.com>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/dev/vge/if_vge.c 150215 2005-09-16 11:25:19Z ru $");
34__FBSDID("$FreeBSD: head/sys/dev/vge/if_vge.c 150306 2005-09-19 03:10:21Z imp $");
35
36/*
37 * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
38 *
39 * Written by Bill Paul <wpaul@windriver.com>
40 * Senior Networking Software Engineer
41 * Wind River Systems
42 */

--- 1075 unchanged lines hidden (view full) ---

1118 * turn the NIC back on and restart the MII ticker,
1119 * which will panic the system when the kernel tries
1120 * to invoke the vge_tick() function that isn't there
1121 * anymore.
1122 */
1123 ifp->if_flags &= ~IFF_UP;
1124 ether_ifdetach(ifp);
1125 }
35
36/*
37 * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
38 *
39 * Written by Bill Paul <wpaul@windriver.com>
40 * Senior Networking Software Engineer
41 * Wind River Systems
42 */

--- 1075 unchanged lines hidden (view full) ---

1118 * turn the NIC back on and restart the MII ticker,
1119 * which will panic the system when the kernel tries
1120 * to invoke the vge_tick() function that isn't there
1121 * anymore.
1122 */
1123 ifp->if_flags &= ~IFF_UP;
1124 ether_ifdetach(ifp);
1125 }
1126 if (ifp)
1127 if_free(ifp);
1128 if (sc->vge_miibus)
1129 device_delete_child(dev, sc->vge_miibus);
1130 bus_generic_detach(dev);
1131
1132 if (sc->vge_intrhand)
1133 bus_teardown_intr(dev, sc->vge_irq, sc->vge_intrhand);
1134 if (sc->vge_irq)
1135 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->vge_irq);
1136 if (sc->vge_res)
1137 bus_release_resource(dev, SYS_RES_MEMORY,
1138 VGE_PCI_LOMEM, sc->vge_res);
1126 if (sc->vge_miibus)
1127 device_delete_child(dev, sc->vge_miibus);
1128 bus_generic_detach(dev);
1129
1130 if (sc->vge_intrhand)
1131 bus_teardown_intr(dev, sc->vge_irq, sc->vge_intrhand);
1132 if (sc->vge_irq)
1133 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->vge_irq);
1134 if (sc->vge_res)
1135 bus_release_resource(dev, SYS_RES_MEMORY,
1136 VGE_PCI_LOMEM, sc->vge_res);
1137 if (ifp)
1138 if_free(ifp);
1139
1140 /* Unload and free the RX DMA ring memory and map */
1141
1142 if (sc->vge_ldata.vge_rx_list_tag) {
1143 bus_dmamap_unload(sc->vge_ldata.vge_rx_list_tag,
1144 sc->vge_ldata.vge_rx_list_map);
1145 bus_dmamem_free(sc->vge_ldata.vge_rx_list_tag,
1146 sc->vge_ldata.vge_rx_list,

--- 1292 unchanged lines hidden ---
1139
1140 /* Unload and free the RX DMA ring memory and map */
1141
1142 if (sc->vge_ldata.vge_rx_list_tag) {
1143 bus_dmamap_unload(sc->vge_ldata.vge_rx_list_tag,
1144 sc->vge_ldata.vge_rx_list_map);
1145 bus_dmamem_free(sc->vge_ldata.vge_rx_list_tag,
1146 sc->vge_ldata.vge_rx_list,

--- 1292 unchanged lines hidden ---