From owner-svn-src-user@FreeBSD.ORG  Thu Apr 23 17:27:02 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 63B511065675;
	Thu, 23 Apr 2009 17:27:02 +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 527CE8FC0A;
	Thu, 23 Apr 2009 17:27:02 +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 n3NHR2Ql094570;
	Thu, 23 Apr 2009 17:27:02 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3NHR2Np094569;
	Thu, 23 Apr 2009 17:27:02 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200904231727.n3NHR2Np094569@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Thu, 23 Apr 2009 17:27:01 +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: r191428 - user/thompsa/vaptq/sys/net80211
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, 23 Apr 2009 17:27:02 -0000

Author: thompsa
Date: Thu Apr 23 17:27:01 2009
New Revision: 191428
URL: http://svn.freebsd.org/changeset/base/191428

Log:
  Remove the done: goto since the rc return code isnt used anymore.

Modified:
  user/thompsa/vaptq/sys/net80211/ieee80211_proto.c

Modified: user/thompsa/vaptq/sys/net80211/ieee80211_proto.c
==============================================================================
--- user/thompsa/vaptq/sys/net80211/ieee80211_proto.c	Thu Apr 23 17:19:25 2009	(r191427)
+++ user/thompsa/vaptq/sys/net80211/ieee80211_proto.c	Thu Apr 23 17:27:01 2009	(r191428)
@@ -1678,7 +1678,7 @@ ieee80211_new_state_locked(struct ieee80
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211vap *vp;
 	enum ieee80211_state ostate;
-	int nrunning, nscanning, rc;
+	int nrunning, nscanning;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
@@ -1724,8 +1724,7 @@ ieee80211_new_state_locked(struct ieee80
 				    __func__, ieee80211_state_name[ostate],
 				    ieee80211_state_name[nstate]);
 				vap->iv_flags_ext |= IEEE80211_FEXT_SCANWAIT;
-				rc = 0;
-				goto done;
+				return (0);
 			}
 			if (nrunning) {
 				/*
@@ -1765,8 +1764,7 @@ ieee80211_new_state_locked(struct ieee80
 			     ieee80211_state_name[ostate],
 			     ieee80211_state_name[nstate]);
 			vap->iv_flags_ext |= IEEE80211_FEXT_SCANWAIT;
-			rc = 0;
-			goto done;
+			return (0);
 		}
 		if (vap->iv_opmode == IEEE80211_M_HOSTAP &&
 		    IEEE80211_IS_CHAN_DFS(ic->ic_bsschan) &&
@@ -1800,8 +1798,6 @@ ieee80211_new_state_locked(struct ieee80
 	vap->iv_nstate_arg = arg;
 	taskqueue_enqueue(ic->ic_tq, &vap->iv_nstate_task);
 	return (EINPROGRESS);
-done:
-	return rc;
 }
 
 int