Deleted Added
full compact
if_wpi.c (216523) if_wpi.c (216557)
1/*-
2 * Copyright (c) 2006,2007
3 * Damien Bergamini <damien.bergamini@free.fr>
4 * Benjamin Close <Benjamin.Close@clearchain.com>
5 *
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.

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

14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 */
18
19#define VERSION "20071127"
20
21#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2006,2007
3 * Damien Bergamini <damien.bergamini@free.fr>
4 * Benjamin Close <Benjamin.Close@clearchain.com>
5 *
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.

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

14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 */
18
19#define VERSION "20071127"
20
21#include <sys/cdefs.h>
22__FBSDID("$FreeBSD: head/sys/dev/wpi/if_wpi.c 216523 2010-12-18 15:45:10Z bschmidt $");
22__FBSDID("$FreeBSD: head/sys/dev/wpi/if_wpi.c 216557 2010-12-19 10:36:06Z bschmidt $");
23
24/*
25 * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
26 *
27 * The 3945ABG network adapter doesn't use traditional hardware as
28 * many other adaptors do. Instead at run time the eeprom is set into a known
29 * state and told to load boot firmware. The boot firmware loads an init and a
30 * main binary firmware image into SRAM on the card via DMA.

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

3556 struct wpi_softc *sc = ifp->if_softc;
3557 int error;
3558
3559 /*
3560 * Only need to set the channel in Monitor mode. AP scanning and auth
3561 * are already taken care of by their respective firmware commands.
3562 */
3563 if (ic->ic_opmode == IEEE80211_M_MONITOR) {
23
24/*
25 * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
26 *
27 * The 3945ABG network adapter doesn't use traditional hardware as
28 * many other adaptors do. Instead at run time the eeprom is set into a known
29 * state and told to load boot firmware. The boot firmware loads an init and a
30 * main binary firmware image into SRAM on the card via DMA.

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

3556 struct wpi_softc *sc = ifp->if_softc;
3557 int error;
3558
3559 /*
3560 * Only need to set the channel in Monitor mode. AP scanning and auth
3561 * are already taken care of by their respective firmware commands.
3562 */
3563 if (ic->ic_opmode == IEEE80211_M_MONITOR) {
3564 WPI_LOCK(sc);
3564 error = wpi_config(sc);
3565 error = wpi_config(sc);
3566 WPI_UNLOCK(sc);
3565 if (error != 0)
3566 device_printf(sc->sc_dev,
3567 "error %d settting channel\n", error);
3568 }
3569}
3570
3571/**
3572 * Called by net80211 to indicate that we need to scan the current

--- 144 unchanged lines hidden ---
3567 if (error != 0)
3568 device_printf(sc->sc_dev,
3569 "error %d settting channel\n", error);
3570 }
3571}
3572
3573/**
3574 * Called by net80211 to indicate that we need to scan the current

--- 144 unchanged lines hidden ---