d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add net80211 media status reporting.

Browse Source 
PR:		142197
Submitted by:	Paul <onemda at gmail.com>
This commit is contained in:
rpaulo 2010-01-05 22:59:59 +00:00
parent c309e354e0
commit a8a04d42db
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/dev/if_ndis/if_ndis.c
View File

@ -189,6 +189,7 @@ static int ndis_set_offload (struct ndis_softc *);
static void ndis_getstate_80211 (struct ndis_softc *); static void ndis_getstate_80211 (struct ndis_softc *);
static void ndis_setstate_80211 (struct ndis_softc *); static void ndis_setstate_80211 (struct ndis_softc *);
static void ndis_auth_and_assoc (struct ndis_softc *, struct ieee80211vap *); static void ndis_auth_and_assoc (struct ndis_softc *, struct ieee80211vap *);
static void ndis_media_status (struct ifnet *, struct ifmediareq *);
static int ndis_set_cipher (struct ndis_softc *, int); static int ndis_set_cipher (struct ndis_softc *, int);
static int ndis_set_wpa (struct ndis_softc *, void *, int); static int ndis_set_wpa (struct ndis_softc *, void *, int);
static int ndis_add_key (struct ieee80211vap *, static int ndis_add_key (struct ieee80211vap *,
@ -993,7 +994,7 @@ ndis_vap_create(struct ieee80211com *ic,
vap->iv_newstate = ndis_newstate; vap->iv_newstate = ndis_newstate;
/* complete setup */ /* complete setup */
ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); ieee80211_vap_attach(vap, ieee80211_media_change, ndis_media_status);
ic->ic_opmode = opmode; ic->ic_opmode = opmode;
/* install key handing routines */ /* install key handing routines */
vap->iv_key_set = ndis_add_key; vap->iv_key_set = ndis_add_key;
@ -2236,6 +2237,23 @@ ndis_set_wpa(sc, ie, ielen)
return (0); return (0);
} }
static void
ndis_media_status(struct ifnet *ifp, struct ifmediareq *imr)
{
struct ieee80211vap *vap = ifp->if_softc;
struct ndis_softc *sc = vap->iv_ic->ic_ifp->if_softc;
uint32_t txrate;
size_t len;
if (!NDIS_INITIALIZED(sc))
return;
len = sizeof(txrate);
if (ndis_get_info(sc, OID_GEN_LINK_SPEED, &txrate, &len) == 0)
vap->iv_bss->ni_txrate = txrate / 5000;
ieee80211_media_status(ifp, imr);
}
static void static void
ndis_setstate_80211(sc) ndis_setstate_80211(sc)
struct ndis_softc *sc; struct ndis_softc *sc;
@ -2696,13 +2714,6 @@ ndis_getstate_80211(sc)
bs->nwbx_ssid.ns_ssidlen); bs->nwbx_ssid.ns_ssidlen);
ni->ni_esslen = bs->nwbx_ssid.ns_ssidlen; ni->ni_esslen = bs->nwbx_ssid.ns_ssidlen;
len = sizeof(arg);
rval = ndis_get_info(sc, OID_GEN_LINK_SPEED, &arg, &len);
if (rval)
device_printf(sc->ndis_dev, "get link speed failed: %d\n",
rval);
ni->ni_txrate = arg / 5000;
if (ic->ic_caps & IEEE80211_C_PMGT) { if (ic->ic_caps & IEEE80211_C_PMGT) {
len = sizeof(arg); len = sizeof(arg);
rval = ndis_get_info(sc, OID_802_11_POWER_MODE, &arg, &len); rval = ndis_get_info(sc, OID_802_11_POWER_MODE, &arg, &len);