Deleted Added
full compact
if_ndis.c (190526) if_ndis.c (190850)
1/*-
2 * Copyright (c) 2003
3 * Bill Paul <wpaul@windriver.com>. 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

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

29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * WPA support originally contributed by Arvind Srinivasan <arvind@celar.us>
33 * then hacked upon mercilessly by my.
34 */
35
36#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2003
3 * Bill Paul <wpaul@windriver.com>. 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

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

29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * WPA support originally contributed by Arvind Srinivasan <arvind@celar.us>
33 * then hacked upon mercilessly by my.
34 */
35
36#include <sys/cdefs.h>
37__FBSDID("$FreeBSD: head/sys/dev/if_ndis/if_ndis.c 190526 2009-03-29 17:59:14Z sam $");
37__FBSDID("$FreeBSD: head/sys/dev/if_ndis/if_ndis.c 190850 2009-04-08 16:19:50Z sam $");
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/sockio.h>
42#include <sys/mbuf.h>
43#include <sys/malloc.h>
44#include <sys/endian.h>
45#include <sys/priv.h>

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

748 TASK_INIT(&sc->ndis_scantask, 0, ndis_scan, sc);
749 TASK_INIT(&sc->ndis_authtask, 0, ndis_auth, sc);
750 TASK_INIT(&sc->ndis_assoctask, 0, ndis_assoc, sc);
751
752 ifp->if_ioctl = ndis_ioctl_80211;
753 ic->ic_ifp = ifp;
754 ic->ic_opmode = IEEE80211_M_STA;
755 ic->ic_phytype = IEEE80211_T_DS;
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/sockio.h>
42#include <sys/mbuf.h>
43#include <sys/malloc.h>
44#include <sys/endian.h>
45#include <sys/priv.h>

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

748 TASK_INIT(&sc->ndis_scantask, 0, ndis_scan, sc);
749 TASK_INIT(&sc->ndis_authtask, 0, ndis_auth, sc);
750 TASK_INIT(&sc->ndis_assoctask, 0, ndis_assoc, sc);
751
752 ifp->if_ioctl = ndis_ioctl_80211;
753 ic->ic_ifp = ifp;
754 ic->ic_opmode = IEEE80211_M_STA;
755 ic->ic_phytype = IEEE80211_T_DS;
756 ic->ic_caps = IEEE80211_C_STA | IEEE80211_C_IBSS;
756 ic->ic_caps = IEEE80211_C_8023ENCAP |
757 IEEE80211_C_STA | IEEE80211_C_IBSS;
757 setbit(ic->ic_modecaps, IEEE80211_MODE_AUTO);
758 len = 0;
759 r = ndis_get_info(sc, OID_802_11_NETWORK_TYPES_SUPPORTED,
760 NULL, &len);
761 if (r != ENOSPC)
762 goto nonettypes;
763 ntl = malloc(len, M_DEVBUF, M_NOWAIT|M_ZERO);
764 r = ndis_get_info(sc, OID_802_11_NETWORK_TYPES_SUPPORTED,

--- 2760 unchanged lines hidden ---
758 setbit(ic->ic_modecaps, IEEE80211_MODE_AUTO);
759 len = 0;
760 r = ndis_get_info(sc, OID_802_11_NETWORK_TYPES_SUPPORTED,
761 NULL, &len);
762 if (r != ENOSPC)
763 goto nonettypes;
764 ntl = malloc(len, M_DEVBUF, M_NOWAIT|M_ZERO);
765 r = ndis_get_info(sc, OID_802_11_NETWORK_TYPES_SUPPORTED,

--- 2760 unchanged lines hidden ---