Deleted Added
full compact
if_iwi.c (192541) if_iwi.c (195562)
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 192541 2009-05-21 15:30:29Z sam $");
31__FBSDID("$FreeBSD: head/sys/dev/iwi/if_iwi.c 195562 2009-07-10 15:28:33Z rpaulo $");
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>

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

2203 case IEEE80211_M_IBSS:
2204 iwi_getfw(&sc->fw_fw, "iwi_ibss", &sc->fw_uc, "iwi_ucode_ibss");
2205 break;
2206 case IEEE80211_M_MONITOR:
2207 iwi_getfw(&sc->fw_fw, "iwi_monitor",
2208 &sc->fw_uc, "iwi_ucode_monitor");
2209 break;
2210 default:
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>

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

2203 case IEEE80211_M_IBSS:
2204 iwi_getfw(&sc->fw_fw, "iwi_ibss", &sc->fw_uc, "iwi_ucode_ibss");
2205 break;
2206 case IEEE80211_M_MONITOR:
2207 iwi_getfw(&sc->fw_fw, "iwi_monitor",
2208 &sc->fw_uc, "iwi_ucode_monitor");
2209 break;
2210 default:
2211 break;
2211 device_printf(sc->sc_dev, "unknown opmode %d\n", opmode);
2212 return EINVAL;
2212 }
2213 fp = sc->fw_fw.fp;
2214 if (fp == NULL) {
2215 device_printf(sc->sc_dev, "could not load firmware\n");
2216 goto bad;
2217 }
2218 if (fp->version < 300) {
2219 /*

--- 1337 unchanged lines hidden ---
2213 }
2214 fp = sc->fw_fw.fp;
2215 if (fp == NULL) {
2216 device_printf(sc->sc_dev, "could not load firmware\n");
2217 goto bad;
2218 }
2219 if (fp->version < 300) {
2220 /*

--- 1337 unchanged lines hidden ---