From owner-svn-src-head@FreeBSD.ORG  Tue Jun  2 20:00:44 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4EE671065807;
	Tue,  2 Jun 2009 20:00:44 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D2BC8FC18;
	Tue,  2 Jun 2009 20:00:44 +0000 (UTC) (envelope-from sam@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 n52K0iic026586;
	Tue, 2 Jun 2009 20:00:44 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52K0i4E026585;
	Tue, 2 Jun 2009 20:00:44 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906022000.n52K0i4E026585@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 2 Jun 2009 20:00:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193340 - head/sys/net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jun 2009 20:00:45 -0000

Author: sam
Date: Tue Jun  2 20:00:43 2009
New Revision: 193340
URL: http://svn.freebsd.org/changeset/base/193340

Log:
  partially fix mode setting; this no longer returns an error but still
  needs to handle the case where the vap is up+running
  
  Noticed by:	"Paul B. Mahol" <onemda@gmail.com>

Modified:
  head/sys/net80211/ieee80211.c

Modified: head/sys/net80211/ieee80211.c
==============================================================================
--- head/sys/net80211/ieee80211.c	Tue Jun  2 20:00:32 2009	(r193339)
+++ head/sys/net80211/ieee80211.c	Tue Jun  2 20:00:43 2009	(r193340)
@@ -1186,7 +1186,7 @@ ieee80211_media_change(struct ifnet *ifp
 		return EINVAL;
 	if (vap->iv_des_mode != newmode) {
 		vap->iv_des_mode = newmode;
-		return ENETRESET;
+		/* XXX kick state machine if up+running */
 	}
 	return 0;
 }