From owner-svn-src-projects@FreeBSD.ORG  Wed Apr 22 23:38:57 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AAC441065673;
	Wed, 22 Apr 2009 23:38:57 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99AA98FC15;
	Wed, 22 Apr 2009 23:38:57 +0000 (UTC)
	(envelope-from rpaulo@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 n3MNcvCr070565;
	Wed, 22 Apr 2009 23:38:57 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3MNcv3T070564;
	Wed, 22 Apr 2009 23:38:57 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904222338.n3MNcv3T070564@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 22 Apr 2009 23:38:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191407 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Apr 2009 23:38:57 -0000

Author: rpaulo
Date: Wed Apr 22 23:38:57 2009
New Revision: 191407
URL: http://svn.freebsd.org/changeset/base/191407

Log:
  Add a default case switch for opmode.
  Use correct variable name tmpmeshid.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Apr 22 21:50:32 2009	(r191406)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Apr 22 23:38:57 2009	(r191407)
@@ -100,6 +100,7 @@ static int
 mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct ieee80211com *ic = vap->iv_ic;
+	struct ieee80211_node *ni;
 	enum ieee80211_state ostate;
 
 	IEEE80211_LOCK_ASSERT(ic);
@@ -124,6 +125,8 @@ mesh_newstate(struct ieee80211vap *vap, 
 	case IEEE80211_S_SCAN:
 		switch (ostate) {
 		case IEEE80211_S_INIT:
+		default:
+			break;
 		}
 	case IEEE80211_S_AUTH:
 	case IEEE80211_S_ASSOC:
@@ -189,7 +192,7 @@ mesh_ioctl_get80211(struct ieee80211vap 
 		if (vap->iv_opmode != IEEE80211_M_MBSS)
 			return EINVAL;
 		ireq->i_len = vap->iv_meshidlen;
-		memcpy(meshid, vap->iv_meshid, ireq->i_len);
+		memcpy(tmpmeshid, vap->iv_meshid, ireq->i_len);
 		error = copyout(tmpmeshid, ireq->i_data, ireq->i_len);
 		break;
 	default: