From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 21:09:50 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 420071065673;
	Mon,  8 Jun 2009 21:09:50 +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 310A88FC15;
	Mon,  8 Jun 2009 21:09:50 +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 n58L9o72043601;
	Mon, 8 Jun 2009 21:09:50 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58L9ors043600;
	Mon, 8 Jun 2009 21:09:50 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906082109.n58L9ors043600@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 21:09:50 +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: r193756 - 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: Mon, 08 Jun 2009 21:09:50 -0000

Author: rpaulo
Date: Mon Jun  8 21:09:49 2009
New Revision: 193756
URL: http://svn.freebsd.org/changeset/base/193756

Log:
  Properly setup data packets.
  
  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	Mon Jun  8 21:05:27 2009	(r193755)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Mon Jun  8 21:09:49 2009	(r193756)
@@ -508,7 +508,7 @@ ieee80211_send_setup(
 			break;
 		case IEEE80211_M_MBSS:
 			/* XXX add support for proxied addresses */
-			if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+			if (IEEE80211_IS_MULTICAST(da)) {
 				wh->i_fc[1] = IEEE80211_FC1_DIR_FROMDS;
 				/* XXX next hop */
 				IEEE80211_ADDR_COPY(wh->i_addr1, da);
@@ -516,6 +516,7 @@ ieee80211_send_setup(
 				    vap->iv_myaddr);
 			} else {
 				wh->i_fc[1] = IEEE80211_FC1_DIR_DSTODS;
+				IEEE80211_ADDR_COPY(wh->i_addr1, da);
 				IEEE80211_ADDR_COPY(wh->i_addr2,
 				    vap->iv_myaddr);
 				IEEE80211_ADDR_COPY(wh->i_addr3, da);