From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 26 15:57:53 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 D8688106564A;
	Fri, 26 Jun 2009 15:57:53 +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 C70918FC17;
	Fri, 26 Jun 2009 15:57:53 +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 n5QFvqZO091005;
	Fri, 26 Jun 2009 15:57:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5QFvqMa091003;
	Fri, 26 Jun 2009 15:57:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906261557.n5QFvqMa091003@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 26 Jun 2009 15:57:52 +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: r195057 - 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, 26 Jun 2009 15:57:54 -0000

Author: rpaulo
Date: Fri Jun 26 15:57:52 2009
New Revision: 195057
URL: http://svn.freebsd.org/changeset/base/195057

Log:
  Revert previous. The mesh conf IE is not present on mesh close frames.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Fri Jun 26 15:48:31 2009	(r195056)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Fri Jun 26 15:57:52 2009	(r195057)
@@ -762,8 +762,6 @@ ieee80211_send_action(struct ieee80211_n
 			ADDSHORT(frm, vargs.fixedarg[2]);   /* reason code */
 			frm = ieee80211_add_meshpeerver(frm, vap);
 			frm = ieee80211_add_meshid(frm, vap);
-			frm = ieee80211_add_meshconf(frm, vap);
-			frm = ieee80211_add_meshpeer(frm,
 			    IEEE80211_MESH_PEER_LINK_CLOSE,
 			    vargs.fixedarg[0], vargs.fixedarg[1],
 			    vargs.fixedarg[2]);