From owner-p4-projects@FreeBSD.ORG  Tue May 29 22:04:18 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 599D316A498; Tue, 29 May 2007 22:04:18 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 26C0A16A46C
	for <perforce@freebsd.org>; Tue, 29 May 2007 22:04:18 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D98313C4AE
	for <perforce@freebsd.org>; Tue, 29 May 2007 22:04:16 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4TM4EiK096879
	for <perforce@freebsd.org>; Tue, 29 May 2007 22:04:14 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TM4E3w096869
	for perforce@freebsd.org; Tue, 29 May 2007 22:04:14 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 29 May 2007 22:04:14 GMT
Message-Id: <200705292204.l4TM4E3w096869@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 120584 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 May 2007 22:04:18 -0000

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

Change 120584 by thompsa@thompsa_heff on 2007/05/29 22:03:08

	Grab the associd from the frame. This lets ieee80211_input process the
	beacon frames and will scan the next channel much quicker for a bgscan.
	
	We may want to just pass a full list of channels to scan to the
	firmware as Linux does it.

Affected files ...

.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#30 edit

Differences ...

==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#30 (text+ko) ====

@@ -1318,6 +1318,7 @@
 #define	SUBTYPE(wh)	((wh)->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
 	const uint8_t *frm, *efrm, *wme;
 	struct ieee80211_node *ni;
+	uint16_t capinfo, status, associd;
 
 	/* NB: +8 for capinfo, status, associd, and first ie */
 	if (!(sizeof(*wh)+8 < len && len < IEEE80211_MAX_LEN) ||
@@ -1334,7 +1335,13 @@
 	 */
 	frm = (const uint8_t *)&wh[1];
 	efrm = ((const uint8_t *) wh) + len;
-	frm += 6;
+
+	capinfo = le16toh(*(const uint16_t *)frm);
+	frm += 2;
+	status = le16toh(*(const uint16_t *)frm);
+	frm += 2;
+	associd = le16toh(*(const uint16_t *)frm);
+	frm += 2;
 
 	wme = NULL;
 	while (frm < efrm) {
@@ -1349,6 +1356,8 @@
 	}
 
 	ni = sc->sc_ic.ic_bss;
+	ni->ni_capinfo = capinfo;
+	ni->ni_associd = associd;
 	if (wme != NULL)
 		ni->ni_flags |= IEEE80211_NODE_QOS;
 	else