Deleted Added
sdiff udiff text old ( 74914 ) new ( 77217 )
full compact
if_an_pccard.c (74914) if_an_pccard.c (77217)
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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
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 *
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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
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 * $FreeBSD: head/sys/dev/an/if_an_pccard.c 74914 2001-03-28 09:17:56Z jhb $
32 * $FreeBSD: head/sys/dev/an/if_an_pccard.c 77217 2001-05-26 09:27:08Z phk $
33 */
34
35/*
36 * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

59#include <sys/mutex.h>
60#include <machine/resource.h>
61
62#include <net/if.h>
63#include <net/if_arp.h>
64#include <net/ethernet.h>
65#include <net/if_dl.h>
66#include <net/if_types.h>
33 */
34
35/*
36 * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

59#include <sys/mutex.h>
60#include <machine/resource.h>
61
62#include <net/if.h>
63#include <net/if_arp.h>
64#include <net/ethernet.h>
65#include <net/if_dl.h>
66#include <net/if_types.h>
67#include <net/if_media.h>
67
68#ifndef lint
69static const char rcsid[] =
68
69#ifndef lint
70static const char rcsid[] =
70 "$FreeBSD: head/sys/dev/an/if_an_pccard.c 74914 2001-03-28 09:17:56Z jhb $";
71 "$FreeBSD: head/sys/dev/an/if_an_pccard.c 77217 2001-05-26 09:27:08Z phk $";
71#endif
72
73#include <dev/an/if_aironet_ieee.h>
74#include <dev/an/if_anreg.h>
75
76/*
77 * Support for PCMCIA cards.
78 */

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

106 struct an_softc *sc = device_get_softc(dev);
107 struct ifnet *ifp = &sc->arpcom.ac_if;
108
109 if (sc->an_gone) {
110 device_printf(dev,"already unloaded\n");
111 return(0);
112 }
113 an_stop(sc);
72#endif
73
74#include <dev/an/if_aironet_ieee.h>
75#include <dev/an/if_anreg.h>
76
77/*
78 * Support for PCMCIA cards.
79 */

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

107 struct an_softc *sc = device_get_softc(dev);
108 struct ifnet *ifp = &sc->arpcom.ac_if;
109
110 if (sc->an_gone) {
111 device_printf(dev,"already unloaded\n");
112 return(0);
113 }
114 an_stop(sc);
115 ifmedia_removeall(&sc->an_ifmedia);
114 ifp->if_flags &= ~IFF_RUNNING;
115 ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
116 sc->an_gone = 1;
117 bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
118 an_release_resources(dev);
119 return (0);
120}
121

--- 42 unchanged lines hidden --- 		116 ifp->if_flags &= ~IFF_RUNNING;
117 ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
118 sc->an_gone = 1;
119 bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
120 an_release_resources(dev);
121 return (0);
122}
123

--- 42 unchanged lines hidden ---