From owner-svn-src-projects@FreeBSD.ORG  Tue Apr 21 16:25:18 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 87C7710656C6;
	Tue, 21 Apr 2009 16:25:18 +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 76AF48FC2B;
	Tue, 21 Apr 2009 16:25:18 +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 n3LGPI6r015677;
	Tue, 21 Apr 2009 16:25:18 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LGPIQW015676;
	Tue, 21 Apr 2009 16:25:18 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904211625.n3LGPIQW015676@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 21 Apr 2009 16:25:18 +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: r191360 - projects/mesh11s/sbin/ifconfig
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: Tue, 21 Apr 2009 16:25:20 -0000

Author: rpaulo
Date: Tue Apr 21 16:25:18 2009
New Revision: 191360
URL: http://svn.freebsd.org/changeset/base/191360

Log:
  Follow the last mesh ioctl rename.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sbin/ifconfig/ifieee80211.c

Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c	Tue Apr 21 15:56:13 2009	(r191359)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c	Tue Apr 21 16:25:18 2009	(r191360)
@@ -581,7 +581,7 @@ set80211meshid(const char *val, int d, i
 	if (get_string(val, NULL, data, &len) == NULL)
 		exit(1);
 
-	set80211(s, IEEE80211_IOC_MESHID, 0, len, data);
+	set80211(s, IEEE80211_IOC_MESH_ID, 0, len, data);
 }	
 
 static void
@@ -3974,7 +3974,7 @@ getid(int s, int ix, void *data, size_t 
 
 	(void) memset(&ireq, 0, sizeof(ireq));
 	(void) strncpy(ireq.i_name, name, sizeof(ireq.i_name));
-	ireq.i_type = (!mesh) ? IEEE80211_IOC_SSID : IEEE80211_IOC_MESHID;
+	ireq.i_type = (!mesh) ? IEEE80211_IOC_SSID : IEEE80211_IOC_MESH_ID;
 	ireq.i_val = ix;
 	ireq.i_data = data;
 	ireq.i_len = len;
@@ -4012,7 +4012,7 @@ ieee80211_status(int s)
 
 	if (opmode == IEEE80211_M_MBSS) {
 		printf("\tmeshid ");
-		getid(s, i, data, sizeof(data), &len, 1);
+		getid(s, 0, data, sizeof(data), &len, 1);
 		print_string(data, len);
 	} else {
 		if (get80211val(s, IEEE80211_IOC_NUMSSIDS, &num) < 0)