svn commit: r191360 - projects/mesh11s/sbin/ifconfig

[Rui Paulo]

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)