misc/142197: ndis is missing media status reporting

[Paul]

>Number:         142197
>Category:       misc
>Synopsis:       ndis is missing media status reporting
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 31 15:30:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Paul
>Release:        CURRENT
>Organization:
>Environment:
FreeBSD dhcppc0 9.0-CURRENT FreeBSD 9.0-CURRENT #4 r201338M: Thu Dec 31 13:28:26 UTC 2009     root at dhcppc0:/usr/obj/usr/src/sys/kernel  i386
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- /sys/dev/if_ndis/if_ndis.c	2009-12-31 12:03:10.000000000 +0000
+++ if_ndis.c	2009-12-31 15:05:30.000000000 +0000
@@ -189,6 +189,7 @@
 static void ndis_getstate_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_media_status	(struct ifnet *, struct ifmediareq *);
 static int ndis_set_cipher	(struct ndis_softc *, int);
 static int ndis_set_wpa		(struct ndis_softc *, void *, int);
 static int ndis_add_key		(struct ieee80211vap *,
@@ -993,7 +994,7 @@
 	vap->iv_newstate = ndis_newstate;
 
 	/* 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;
 	/* install key handing routines */
 	vap->iv_key_set = ndis_add_key;
@@ -2237,6 +2238,23 @@
 }
 
 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
 ndis_setstate_80211(sc)
 	struct ndis_softc	*sc;
 {
@@ -2696,13 +2714,6 @@
 	    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) {
 		len = sizeof(arg);
 		rval = ndis_get_info(sc, OID_802_11_POWER_MODE, &arg, &len);


>Release-Note:
>Audit-Trail:
>Unformatted: