Deleted Added
full compact
if_wi.c (192517) if_wi.c (194023)
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

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

55 * from the HCF Light code and corresponding documentation.
56 *
57 * This driver supports the ISA, PCMCIA and PCI versions of the Lucent
58 * WaveLan cards (based on the Hermes chipset), as well as the newer
59 * Prism 2 chipsets with firmware from Intersil and Symbol.
60 */
61
62#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

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

55 * from the HCF Light code and corresponding documentation.
56 *
57 * This driver supports the ISA, PCMCIA and PCI versions of the Lucent
58 * WaveLan cards (based on the Hermes chipset), as well as the newer
59 * Prism 2 chipsets with firmware from Intersil and Symbol.
60 */
61
62#include <sys/cdefs.h>
63__FBSDID("$FreeBSD: head/sys/dev/wi/if_wi.c 192517 2009-05-21 04:00:31Z sam $");
63__FBSDID("$FreeBSD: head/sys/dev/wi/if_wi.c 194023 2009-06-11 17:14:28Z avg $");
64
65#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
66
67#include <sys/param.h>
68#include <sys/systm.h>
69#include <sys/endian.h>
70#include <sys/sockio.h>
71#include <sys/mbuf.h>

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

566wi_vap_delete(struct ieee80211vap *vap)
567{
568 struct wi_vap *wvp = WI_VAP(vap);
569
570 ieee80211_vap_detach(vap);
571 free(wvp, M_80211_VAP);
572}
573
64
65#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
66
67#include <sys/param.h>
68#include <sys/systm.h>
69#include <sys/endian.h>
70#include <sys/sockio.h>
71#include <sys/mbuf.h>

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

566wi_vap_delete(struct ieee80211vap *vap)
567{
568 struct wi_vap *wvp = WI_VAP(vap);
569
570 ieee80211_vap_detach(vap);
571 free(wvp, M_80211_VAP);
572}
573
574void
574int
575wi_shutdown(device_t dev)
576{
577 struct wi_softc *sc = device_get_softc(dev);
578
579 wi_stop(sc, 1);
575wi_shutdown(device_t dev)
576{
577 struct wi_softc *sc = device_get_softc(dev);
578
579 wi_stop(sc, 1);
580 return (0);
580}
581
582void
583wi_intr(void *arg)
584{
585 struct wi_softc *sc = arg;
586 struct ifnet *ifp = sc->sc_ifp;
587 u_int16_t status;

--- 1536 unchanged lines hidden ---
581}
582
583void
584wi_intr(void *arg)
585{
586 struct wi_softc *sc = arg;
587 struct ifnet *ifp = sc->sc_ifp;
588 u_int16_t status;

--- 1536 unchanged lines hidden ---