From owner-p4-projects@FreeBSD.ORG  Mon Jun  4 04:57:24 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 4DF6816A469; Mon,  4 Jun 2007 04:57:24 +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 0C8C916A400
	for <perforce@freebsd.org>; Mon,  4 Jun 2007 04:57:24 +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 DA3CA13C44C
	for <perforce@freebsd.org>; Mon,  4 Jun 2007 04:57:23 +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 l544vN9x014452
	for <perforce@freebsd.org>; Mon, 4 Jun 2007 04:57:23 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l544vNUw014446
	for perforce@freebsd.org; Mon, 4 Jun 2007 04:57:23 GMT
	(envelope-from thompsa@freebsd.org)
Date: Mon, 4 Jun 2007 04:57:23 GMT
Message-Id: <200706040457.l544vNUw014446@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 120874 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: Mon, 04 Jun 2007 04:57:24 -0000

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

Change 120874 by thompsa@thompsa_heff on 2007/06/04 04:57:22

	Remove check for state > INIT before scanning, ieee80211_init will not
	put us into SCAN if IEEE80211_ROAMING_MANUAL is set.
	
	Fixes one failure of WPA.

Affected files ...

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

Differences ...

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

@@ -3537,9 +3537,6 @@
 		msleep(sc, &sc->sc_mtx, 0, "iwicmd", hz/10);
 	}
 
-	if (ic->ic_state == IEEE80211_S_INIT) 
-		goto done;
-
 	switch (cmd) {
 	case IWI_ASSOC:
 		iwi_auth_and_assoc(sc);