Deleted Added
full compact
if_ndis.c (148887) if_ndis.c (150306)
1/*-
2 * Copyright (c) 2003
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

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

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 * WPA support added by Arvind Srinivasan <arvind@celar.us>
33 */
34
35#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2003
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

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

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 * WPA support added by Arvind Srinivasan <arvind@celar.us>
33 */
34
35#include <sys/cdefs.h>
36__FBSDID("$FreeBSD: head/sys/dev/if_ndis/if_ndis.c 148887 2005-08-09 10:20:02Z rwatson $");
36__FBSDID("$FreeBSD: head/sys/dev/if_ndis/if_ndis.c 150306 2005-09-19 03:10:21Z imp $");
37
38#include "opt_bdg.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/sockio.h>
43#include <sys/mbuf.h>
44#include <sys/malloc.h>

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

880 NDIS_UNLOCK(sc);
881 ndis_stop(sc);
882 if (sc->ndis_80211)
883 ieee80211_ifdetach(&sc->ic);
884 else
885 ether_ifdetach(ifp);
886 } else
887 NDIS_UNLOCK(sc);
37
38#include "opt_bdg.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/sockio.h>
43#include <sys/mbuf.h>
44#include <sys/malloc.h>

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

880 NDIS_UNLOCK(sc);
881 ndis_stop(sc);
882 if (sc->ndis_80211)
883 ieee80211_ifdetach(&sc->ic);
884 else
885 ether_ifdetach(ifp);
886 } else
887 NDIS_UNLOCK(sc);
888 if (ifp != NULL)
889 if_free(ifp);
890
891 bus_generic_detach(dev);
892
893 if (sc->ndis_intrhand)
894 bus_teardown_intr(dev, sc->ndis_irq, sc->ndis_intrhand);
895 if (sc->ndis_irq)
896 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->ndis_irq);
897 if (sc->ndis_res_io)
898 bus_release_resource(dev, SYS_RES_IOPORT,
899 sc->ndis_io_rid, sc->ndis_res_io);
900 if (sc->ndis_res_mem)
901 bus_release_resource(dev, SYS_RES_MEMORY,
902 sc->ndis_mem_rid, sc->ndis_res_mem);
903 if (sc->ndis_res_altmem)
904 bus_release_resource(dev, SYS_RES_MEMORY,
905 sc->ndis_altmem_rid, sc->ndis_res_altmem);
906
888
889 bus_generic_detach(dev);
890
891 if (sc->ndis_intrhand)
892 bus_teardown_intr(dev, sc->ndis_irq, sc->ndis_intrhand);
893 if (sc->ndis_irq)
894 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->ndis_irq);
895 if (sc->ndis_res_io)
896 bus_release_resource(dev, SYS_RES_IOPORT,
897 sc->ndis_io_rid, sc->ndis_res_io);
898 if (sc->ndis_res_mem)
899 bus_release_resource(dev, SYS_RES_MEMORY,
900 sc->ndis_mem_rid, sc->ndis_res_mem);
901 if (sc->ndis_res_altmem)
902 bus_release_resource(dev, SYS_RES_MEMORY,
903 sc->ndis_altmem_rid, sc->ndis_res_altmem);
904
905 if (ifp != NULL)
906 if_free(ifp);
907
907 if (sc->ndis_iftype == PCMCIABus)
908 ndis_free_amem(sc);
909
910 if (sc->ndis_sc)
911 ndis_destroy_dma(sc);
912
913 if (sc->ndis_txarray)
914 free(sc->ndis_txarray, M_DEVBUF);

--- 2111 unchanged lines hidden ---
908 if (sc->ndis_iftype == PCMCIABus)
909 ndis_free_amem(sc);
910
911 if (sc->ndis_sc)
912 ndis_destroy_dma(sc);
913
914 if (sc->ndis_txarray)
915 free(sc->ndis_txarray, M_DEVBUF);

--- 2111 unchanged lines hidden ---