PERFORCE change 65735 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=65735

Change 65735 by sam at sam_ebb on 2004/11/23 22:44:16

	correct station-mode wme parameter updates received
	from management frames

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#17 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#17 (text+ko) ====

@@ -1557,15 +1557,14 @@
 		return 0;
 	}
 	qosinfo = frm[__offsetof(struct ieee80211_wme_param, param_qosInfo)];
-	if ((qosinfo & WME_QOSINFO_COUNT) < wme->wme_wmeChanParams.cap_info) {
-		IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME,
-			"%s: count mismatch, qosinfo 0x%x expected 0x%x\n",
-			__func__, qosinfo, wme->wme_wmeChanParams.cap_info);
+	qosinfo &= WME_QOSINFO_COUNT;
+	/* XXX do proper check for wraparound */
+	if (qosinfo == wme->wme_wmeChanParams.cap_info)
 		return 0;
-	}
 	frm += __offsetof(struct ieee80211_wme_param, params_acParams);
 	for (i = 0; i < WME_NUM_AC; i++) {
-		struct wmeParams *wmep = &wme->wme_chanParams.cap_wmeParams[i];
+		struct wmeParams *wmep =
+			&wme->wme_wmeChanParams.cap_wmeParams[i];
 		/* NB: ACI not used */
 		wmep->wmep_acm = MS(frm[0], WME_PARAM_ACM);
 		wmep->wmep_aifsn = MS(frm[0], WME_PARAM_AIFSN);
@@ -1574,6 +1573,7 @@
 		wmep->wmep_txopLimit = LE_READ_2(frm+2);
 		frm += 4;
 	}
+	wme->wme_wmeChanParams.cap_info = qosinfo;
 	return 1;
 #undef MS
 }