From owner-svn-src-user@FreeBSD.ORG  Thu Apr 30 18:56:01 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3F7B106564A;
	Thu, 30 Apr 2009 18:56:00 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E281B8FC1F;
	Thu, 30 Apr 2009 18:56:00 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3UIu0Wo020193;
	Thu, 30 Apr 2009 18:56:00 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3UIu061020192;
	Thu, 30 Apr 2009 18:56:00 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200904301856.n3UIu061020192@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Thu, 30 Apr 2009 18:56:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191700 - user/thompsa/vaptq/sys/dev/wi
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Apr 2009 18:56:01 -0000

Author: thompsa
Date: Thu Apr 30 18:56:00 2009
New Revision: 191700
URL: http://svn.freebsd.org/changeset/base/191700

Log:
  Change the newstate return code from EINPROGRESS to 0 when we circumvent the
  state change since it did actually complete.

Modified:
  user/thompsa/vaptq/sys/dev/wi/if_wi.c

Modified: user/thompsa/vaptq/sys/dev/wi/if_wi.c
==============================================================================
--- user/thompsa/vaptq/sys/dev/wi/if_wi.c	Thu Apr 30 18:00:53 2009	(r191699)
+++ user/thompsa/vaptq/sys/dev/wi/if_wi.c	Thu Apr 30 18:56:00 2009	(r191700)
@@ -892,7 +892,7 @@ wi_newstate_sta(struct ieee80211vap *vap
 		 * notification we get on association.
 		 */
 		vap->iv_state = nstate;
-		return EINPROGRESS;
+		return (0);
 	}
 	return WI_VAP(vap)->wv_newstate(vap, nstate, arg);
 }