From owner-svn-src-projects@FreeBSD.ORG  Fri Apr 24 18:47: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 AE9F71065687;
	Fri, 24 Apr 2009 18:47: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 9DC198FC13;
	Fri, 24 Apr 2009 18:47: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 n3OIlIwC029575;
	Fri, 24 Apr 2009 18:47:18 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OIlI6D029573;
	Fri, 24 Apr 2009 18:47:18 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904241847.n3OIlI6D029573@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 24 Apr 2009 18:47: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: r191471 - 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: Fri, 24 Apr 2009 18:47:19 -0000

Author: rpaulo
Date: Fri Apr 24 18:47:18 2009
New Revision: 191471
URL: http://svn.freebsd.org/changeset/base/191471

Log:
  Use IEEE80211_MESHID_LEN for consistency.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_scan.h
  projects/mesh11s/sys/net80211/ieee80211_var.h

Modified: projects/mesh11s/sys/net80211/ieee80211_scan.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_scan.h	Fri Apr 24 18:39:11 2009	(r191470)
+++ projects/mesh11s/sys/net80211/ieee80211_scan.h	Fri Apr 24 18:47:18 2009	(r191471)
@@ -242,7 +242,7 @@ struct ieee80211_scan_entry {
 	int8_t		se_rssi;	/* avg'd recv ssi */
 	int8_t		se_noise;	/* noise floor */
 	uint8_t		se_cc[2];	/* captured country code */
-	uint8_t		se_meshid[2+IEEE80211_NWID_LEN];
+	uint8_t		se_meshid[2+IEEE80211_MESHID_LEN];
 	struct ieee80211_ies se_ies;	/* captured ie's */
 	u_int		se_age;		/* age of entry (0 on create) */
 };

Modified: projects/mesh11s/sys/net80211/ieee80211_var.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_var.h	Fri Apr 24 18:39:11 2009	(r191470)
+++ projects/mesh11s/sys/net80211/ieee80211_var.h	Fri Apr 24 18:47:18 2009	(r191471)
@@ -372,7 +372,7 @@ struct ieee80211vap {
 						/* set/unset aid pwrsav state */
 	int			iv_csa_count;	/* count for doing CSA */
 	int			iv_meshidlen;
-	uint8_t			iv_meshid[IEEE80211_NWID_LEN];
+	uint8_t			iv_meshid[IEEE80211_MESHID_LEN];
 
 	struct ieee80211_node	*iv_bss;	/* information for this node */
 	struct ieee80211_txparam iv_txparms[IEEE80211_MODE_MAX];