| if_iwi.c (290407) | if_iwi.c (293339) |
|---|---|
| 1/*- 2 * Copyright (c) 2004, 2005 3 * Damien Bergamini <damien.bergamini@free.fr>. All rights reserved. 4 * Copyright (c) 2005-2006 Sam Leffler, Errno Consulting 5 * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org> 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2004, 2005 3 * Damien Bergamini <damien.bergamini@free.fr>. All rights reserved. 4 * Copyright (c) 2005-2006 Sam Leffler, Errno Consulting 5 * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org> 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> |
| 31__FBSDID("$FreeBSD: head/sys/dev/iwi/if_iwi.c 290407 2015-11-05 17:58:18Z avos $"); | 31__FBSDID("$FreeBSD: head/sys/dev/iwi/if_iwi.c 293339 2016-01-07 18:41:03Z avos $"); |
| 32 33/*- 34 * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver 35 * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm 36 */ 37 38#include <sys/param.h> 39#include <sys/sysctl.h> --- 226 unchanged lines hidden (view full) --- 266} 267 268static int 269iwi_attach(device_t dev) 270{ 271 struct iwi_softc *sc = device_get_softc(dev); 272 struct ieee80211com *ic = &sc->sc_ic; 273 uint16_t val; | 32 33/*- 34 * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver 35 * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm 36 */ 37 38#include <sys/param.h> 39#include <sys/sysctl.h> --- 226 unchanged lines hidden (view full) --- 266} 267 268static int 269iwi_attach(device_t dev) 270{ 271 struct iwi_softc *sc = device_get_softc(dev); 272 struct ieee80211com *ic = &sc->sc_ic; 273 uint16_t val; |
| 274 uint8_t bands[howmany(IEEE80211_MODE_MAX, 8)]; |
|
| 274 int i, error; | 275 int i, error; |
| 275 uint8_t bands; | |
| 276 277 sc->sc_dev = dev; 278 279 IWI_LOCK_INIT(sc); 280 mbufq_init(&sc->sc_snd, ifqmaxlen); 281 282 sc->sc_unr = new_unrhdr(1, IWI_MAX_IBSSNODE-1, &sc->sc_mtx); 283 --- 84 unchanged lines hidden (view full) --- 368 ic->ic_macaddr[0] = val & 0xff; 369 ic->ic_macaddr[1] = val >> 8; 370 val = iwi_read_prom_word(sc, IWI_EEPROM_MAC + 1); 371 ic->ic_macaddr[2] = val & 0xff; 372 ic->ic_macaddr[3] = val >> 8; 373 val = iwi_read_prom_word(sc, IWI_EEPROM_MAC + 2); 374 ic->ic_macaddr[4] = val & 0xff; 375 ic->ic_macaddr[5] = val >> 8; | 276 277 sc->sc_dev = dev; 278 279 IWI_LOCK_INIT(sc); 280 mbufq_init(&sc->sc_snd, ifqmaxlen); 281 282 sc->sc_unr = new_unrhdr(1, IWI_MAX_IBSSNODE-1, &sc->sc_mtx); 283 --- 84 unchanged lines hidden (view full) --- 368 ic->ic_macaddr[0] = val & 0xff; 369 ic->ic_macaddr[1] = val >> 8; 370 val = iwi_read_prom_word(sc, IWI_EEPROM_MAC + 1); 371 ic->ic_macaddr[2] = val & 0xff; 372 ic->ic_macaddr[3] = val >> 8; 373 val = iwi_read_prom_word(sc, IWI_EEPROM_MAC + 2); 374 ic->ic_macaddr[4] = val & 0xff; 375 ic->ic_macaddr[5] = val >> 8; |
| 376 377 bands = 0; 378 setbit(&bands, IEEE80211_MODE_11B); 379 setbit(&bands, IEEE80211_MODE_11G); | 376 377 memset(bands, 0, sizeof(bands)); 378 setbit(bands, IEEE80211_MODE_11B); 379 setbit(bands, IEEE80211_MODE_11G); |
| 380 if (pci_get_device(dev) >= 0x4223) | 380 if (pci_get_device(dev) >= 0x4223) |
| 381 setbit(&bands, IEEE80211_MODE_11A); 382 ieee80211_init_channels(ic, NULL, &bands); | 381 setbit(bands, IEEE80211_MODE_11A); 382 ieee80211_init_channels(ic, NULL, bands); |
| 383 384 ieee80211_ifattach(ic); 385 /* override default methods */ 386 ic->ic_node_alloc = iwi_node_alloc; 387 sc->sc_node_free = ic->ic_node_free; 388 ic->ic_node_free = iwi_node_free; 389 ic->ic_raw_xmit = iwi_raw_xmit; 390 ic->ic_scan_start = iwi_scan_start; --- 3181 unchanged lines hidden --- | 383 384 ieee80211_ifattach(ic); 385 /* override default methods */ 386 ic->ic_node_alloc = iwi_node_alloc; 387 sc->sc_node_free = ic->ic_node_free; 388 ic->ic_node_free = iwi_node_free; 389 ic->ic_raw_xmit = iwi_raw_xmit; 390 ic->ic_scan_start = iwi_scan_start; --- 3181 unchanged lines hidden --- |