svn commit: r193756 - projects/mesh11s/sys/net80211

[Rui Paulo]

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);