Deleted Added
full compact
if_an.c (69399) if_an.c (71228)
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.c 69399 2000-11-30 18:52:32Z alfred $
32 * $FreeBSD: head/sys/dev/an/if_an.c 71228 2001-01-19 01:59:14Z bmilekic $
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

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

125
126#include <machine/md_var.h>
127
128#include <dev/an/if_aironet_ieee.h>
129#include <dev/an/if_anreg.h>
130
131#if !defined(lint)
132static const char rcsid[] =
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

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

125
126#include <machine/md_var.h>
127
128#include <dev/an/if_aironet_ieee.h>
129#include <dev/an/if_anreg.h>
130
131#if !defined(lint)
132static const char rcsid[] =
133 "$FreeBSD: head/sys/dev/an/if_an.c 69399 2000-11-30 18:52:32Z alfred $";
133 "$FreeBSD: head/sys/dev/an/if_an.c 71228 2001-01-19 01:59:14Z bmilekic $";
134#endif
135
136/* These are global because we need them in sys/pci/if_an_p.c. */
137static void an_reset __P((struct an_softc *));
138static int an_ioctl __P((struct ifnet *, u_long, caddr_t));
139static void an_init __P((void *));
140static int an_init_tx_ring __P((struct an_softc *));
141static void an_start __P((struct ifnet *));

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

283
284int an_attach(sc, unit, flags)
285 struct an_softc *sc;
286 int unit;
287 int flags;
288{
289 struct ifnet *ifp = &sc->arpcom.ac_if;
290
134#endif
135
136/* These are global because we need them in sys/pci/if_an_p.c. */
137static void an_reset __P((struct an_softc *));
138static int an_ioctl __P((struct ifnet *, u_long, caddr_t));
139static void an_init __P((void *));
140static int an_init_tx_ring __P((struct an_softc *));
141static void an_start __P((struct ifnet *));

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

283
284int an_attach(sc, unit, flags)
285 struct an_softc *sc;
286 int unit;
287 int flags;
288{
289 struct ifnet *ifp = &sc->arpcom.ac_if;
290
291 mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_DEF);
291 mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_DEF |
292 MTX_RECURSE);
292 AN_LOCK(sc);
293
294 sc->an_gone = 0;
295 sc->an_associated = 0;
296
297 /* Reset the NIC. */
298 an_reset(sc);
299

--- 1256 unchanged lines hidden ---
293 AN_LOCK(sc);
294
295 sc->an_gone = 0;
296 sc->an_associated = 0;
297
298 /* Reset the NIC. */
299 an_reset(sc);
300

--- 1256 unchanged lines hidden ---