svn commit: r198384 - head/sys/net80211

[Rui Paulo]

Author: rpaulo
Date: Fri Oct 23 11:13:08 2009
New Revision: 198384
URL: http://svn.freebsd.org/changeset/base/198384

Log:
  The draft spec doesn't say beacon frames need to have a wildcard BSSID,
  so remove the mesh code necessary for that.
  
  MFC after:	2 days

Modified:
  head/sys/net80211/ieee80211_output.c

Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c	Fri Oct 23 09:30:19 2009	(r198383)
+++ head/sys/net80211/ieee80211_output.c	Fri Oct 23 11:13:08 2009	(r198384)
@@ -2764,13 +2764,7 @@ ieee80211_beacon_alloc(struct ieee80211_
 	*(uint16_t *)wh->i_dur = 0;
 	IEEE80211_ADDR_COPY(wh->i_addr1, ifp->if_broadcastaddr);
 	IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr);
-#ifdef IEEE80211_SUPPORT_MESH
-	if (vap->iv_opmode == IEEE80211_M_MBSS) {
-		static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
-		IEEE80211_ADDR_COPY(wh->i_addr3, zerobssid);
-	} else
-#endif
-		IEEE80211_ADDR_COPY(wh->i_addr3, ni->ni_bssid);
+	IEEE80211_ADDR_COPY(wh->i_addr3, ni->ni_bssid);
 	*(uint16_t *)wh->i_seq = 0;
 
 	return m;