Deleted Added
full compact
if_an_pccard.c (166901) if_an_pccard.c (198995)
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

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

33 * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD.
34 *
35 * Written by Bill Paul <wpaul@ctr.columbia.edu>
36 * Electrical Engineering Department
37 * Columbia University, New York City
38 */
39
40#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

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

33 * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD.
34 *
35 * Written by Bill Paul <wpaul@ctr.columbia.edu>
36 * Electrical Engineering Department
37 * Columbia University, New York City
38 */
39
40#include <sys/cdefs.h>
41__FBSDID("$FreeBSD: head/sys/dev/an/if_an_pccard.c 166901 2007-02-23 12:19:07Z piso $");
41__FBSDID("$FreeBSD: head/sys/dev/an/if_an_pccard.c 198995 2009-11-06 18:28:13Z jhb $");
42
43#include "opt_inet.h"
44
45#ifdef INET
46#define ANCACHE
47#endif
48
49#include <sys/param.h>

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

140 goto fail;
141
142 an_alloc_irq(dev, sc->irq_rid, 0);
143
144 sc->an_bhandle = rman_get_bushandle(sc->port_res);
145 sc->an_btag = rman_get_bustag(sc->port_res);
146 sc->an_dev = dev;
147
42
43#include "opt_inet.h"
44
45#ifdef INET
46#define ANCACHE
47#endif
48
49#include <sys/param.h>

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

140 goto fail;
141
142 an_alloc_irq(dev, sc->irq_rid, 0);
143
144 sc->an_bhandle = rman_get_bushandle(sc->port_res);
145 sc->an_btag = rman_get_bustag(sc->port_res);
146 sc->an_dev = dev;
147
148 error = an_attach(sc, device_get_unit(dev), flags);
148 error = an_attach(sc, flags);
149 if (error)
150 goto fail;
151
152 /*
153 * Must setup the interrupt after the an_attach to prevent racing.
154 */
155 error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET,
156 NULL, an_intr, sc, &sc->irq_handle);
157fail:
158 if (error)
159 an_release_resources(dev);
160 return (error);
161}
149 if (error)
150 goto fail;
151
152 /*
153 * Must setup the interrupt after the an_attach to prevent racing.
154 */
155 error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET,
156 NULL, an_intr, sc, &sc->irq_handle);
157fail:
158 if (error)
159 an_release_resources(dev);
160 return (error);
161}