Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Apr 2009 17:27:01 +0000 (UTC)
From:      Andrew Thompson <thompsa@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r191428 - user/thompsa/vaptq/sys/net80211
Message-ID:  <200904231727.n3NHR2Np094569@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904231727.n3NHR2Np094569>