Deleted Added
full compact
if_ipw.c (222543) if_ipw.c (228621)
1/* $FreeBSD: head/sys/dev/ipw/if_ipw.c 222543 2011-05-31 19:08:25Z bschmidt $ */
1/* $FreeBSD: head/sys/dev/ipw/if_ipw.c 228621 2011-12-17 10:23:17Z bschmidt $ */
2
3/*-
4 * Copyright (c) 2004-2006
5 * Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
6 * Copyright (c) 2006 Sam Leffler, Errno Consulting
7 * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org>
8 *
9 * Redistribution and use in source and binary forms, with or without

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

25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
2
3/*-
4 * Copyright (c) 2004-2006
5 * Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
6 * Copyright (c) 2006 Sam Leffler, Errno Consulting
7 * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org>
8 *
9 * Redistribution and use in source and binary forms, with or without

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

25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/dev/ipw/if_ipw.c 222543 2011-05-31 19:08:25Z bschmidt $");
33__FBSDID("$FreeBSD: head/sys/dev/ipw/if_ipw.c 228621 2011-12-17 10:23:17Z bschmidt $");
34
35/*-
36 * Intel(R) PRO/Wireless 2100 MiniPCI driver
37 * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
38 */
39
40#include <sys/param.h>
41#include <sys/sysctl.h>

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

103
104static const struct ipw_ident ipw_ident_table[] = {
105 { 0x8086, 0x1043, "Intel(R) PRO/Wireless 2100 MiniPCI" },
106
107 { 0, 0, NULL }
108};
109
110static struct ieee80211vap *ipw_vap_create(struct ieee80211com *,
34
35/*-
36 * Intel(R) PRO/Wireless 2100 MiniPCI driver
37 * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
38 */
39
40#include <sys/param.h>
41#include <sys/sysctl.h>

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

103
104static const struct ipw_ident ipw_ident_table[] = {
105 { 0x8086, 0x1043, "Intel(R) PRO/Wireless 2100 MiniPCI" },
106
107 { 0, 0, NULL }
108};
109
110static struct ieee80211vap *ipw_vap_create(struct ieee80211com *,
111 const char name[IFNAMSIZ], int unit, int opmode, int flags,
112 const uint8_t bssid[IEEE80211_ADDR_LEN],
113 const uint8_t mac[IEEE80211_ADDR_LEN]);
111 const char [IFNAMSIZ], int, enum ieee80211_opmode, int,
112 const uint8_t [IEEE80211_ADDR_LEN],
113 const uint8_t [IEEE80211_ADDR_LEN]);
114static void ipw_vap_delete(struct ieee80211vap *);
115static int ipw_dma_alloc(struct ipw_softc *);
116static void ipw_release(struct ipw_softc *);
117static void ipw_media_status(struct ifnet *, struct ifmediareq *);
118static int ipw_newstate(struct ieee80211vap *, enum ieee80211_state, int);
119static uint16_t ipw_read_prom_word(struct ipw_softc *, uint8_t);
120static void ipw_rx_cmd_intr(struct ipw_softc *, struct ipw_soft_buf *);
121static void ipw_rx_newstate_intr(struct ipw_softc *, struct ipw_soft_buf *);

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

423 }
424
425 mtx_destroy(&sc->sc_mtx);
426
427 return 0;
428}
429
430static struct ieee80211vap *
114static void ipw_vap_delete(struct ieee80211vap *);
115static int ipw_dma_alloc(struct ipw_softc *);
116static void ipw_release(struct ipw_softc *);
117static void ipw_media_status(struct ifnet *, struct ifmediareq *);
118static int ipw_newstate(struct ieee80211vap *, enum ieee80211_state, int);
119static uint16_t ipw_read_prom_word(struct ipw_softc *, uint8_t);
120static void ipw_rx_cmd_intr(struct ipw_softc *, struct ipw_soft_buf *);
121static void ipw_rx_newstate_intr(struct ipw_softc *, struct ipw_soft_buf *);

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

423 }
424
425 mtx_destroy(&sc->sc_mtx);
426
427 return 0;
428}
429
430static struct ieee80211vap *
431ipw_vap_create(struct ieee80211com *ic,
432 const char name[IFNAMSIZ], int unit, int opmode, int flags,
433 const uint8_t bssid[IEEE80211_ADDR_LEN],
434 const uint8_t mac[IEEE80211_ADDR_LEN])
431ipw_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
432 enum ieee80211_opmode opmode, int flags,
433 const uint8_t bssid[IEEE80211_ADDR_LEN],
434 const uint8_t mac[IEEE80211_ADDR_LEN])
435{
436 struct ifnet *ifp = ic->ic_ifp;
437 struct ipw_softc *sc = ifp->if_softc;
438 struct ipw_vap *ivp;
439 struct ieee80211vap *vap;
440 const struct firmware *fp;
441 const struct ipw_firmware_hdr *hdr;
442 const char *imagename;

--- 2276 unchanged lines hidden ---
435{
436 struct ifnet *ifp = ic->ic_ifp;
437 struct ipw_softc *sc = ifp->if_softc;
438 struct ipw_vap *ivp;
439 struct ieee80211vap *vap;
440 const struct firmware *fp;
441 const struct ipw_firmware_hdr *hdr;
442 const char *imagename;

--- 2276 unchanged lines hidden ---