Deleted Added
full compact
if_ti.c (113609) if_ti.c (113812)
1/*
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. 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

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

72 * - Raymond Lee of Netgear, for providing a pair of Netgear
73 * GA620 Tigon 2 boards for testing
74 * - Ulf Zimmermann, for bringing the GA260 to my attention and
75 * convincing me to write this driver.
76 * - Andrew Gallatin for providing FreeBSD/Alpha support.
77 */
78
79#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. 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

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

72 * - Raymond Lee of Netgear, for providing a pair of Netgear
73 * GA620 Tigon 2 boards for testing
74 * - Ulf Zimmermann, for bringing the GA260 to my attention and
75 * convincing me to write this driver.
76 * - Andrew Gallatin for providing FreeBSD/Alpha support.
77 */
78
79#include <sys/cdefs.h>
80__FBSDID("$FreeBSD: head/sys/dev/ti/if_ti.c 113609 2003-04-17 20:32:06Z njl $");
80__FBSDID("$FreeBSD: head/sys/dev/ti/if_ti.c 113812 2003-04-21 18:34:04Z imp $");
81
82#include "opt_ti.h"
83
84#include <sys/param.h>
85#include <sys/systm.h>
86#include <sys/sockio.h>
87#include <sys/mbuf.h>
88#include <sys/malloc.h>

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

2372 return EBUSY;
2373
2374 sc = device_get_softc(dev);
2375 KASSERT(mtx_initialized(&sc->ti_mtx), ("ti mutex not initialized"));
2376 TI_LOCK(sc);
2377 ifp = &sc->arpcom.ac_if;
2378
2379 /* These should only be active if attach succeeded */
81
82#include "opt_ti.h"
83
84#include <sys/param.h>
85#include <sys/systm.h>
86#include <sys/sockio.h>
87#include <sys/mbuf.h>
88#include <sys/malloc.h>

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

2372 return EBUSY;
2373
2374 sc = device_get_softc(dev);
2375 KASSERT(mtx_initialized(&sc->ti_mtx), ("ti mutex not initialized"));
2376 TI_LOCK(sc);
2377 ifp = &sc->arpcom.ac_if;
2378
2379 /* These should only be active if attach succeeded */
2380 if (device_is_alive(dev)) {
2380 if (device_is_attached(dev)) {
2381 ti_stop(sc);
2382 ether_ifdetach(ifp);
2383 bus_generic_detach(dev);
2384 }
2385 ifmedia_removeall(&sc->ifmedia);
2386
2387 if (sc->ti_intrhand)
2388 bus_teardown_intr(dev, sc->ti_irq, sc->ti_intrhand);

--- 1238 unchanged lines hidden ---
2381 ti_stop(sc);
2382 ether_ifdetach(ifp);
2383 bus_generic_detach(dev);
2384 }
2385 ifmedia_removeall(&sc->ifmedia);
2386
2387 if (sc->ti_intrhand)
2388 bus_teardown_intr(dev, sc->ti_irq, sc->ti_intrhand);

--- 1238 unchanged lines hidden ---