summaryrefslogtreecommitdiffstats
path: root/sys/net80211
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2009-10-23 11:13:08 +0000
committerrpaulo <rpaulo@FreeBSD.org>2009-10-23 11:13:08 +0000
commit92ba0082b7eb4da299f61cebe57aa25491c5882f (patch)
tree3debc0b584287d6c93e41700756f0d814f60ffb6 /sys/net80211
parent00cbb9550382fe0aa0116d9ced59c4d68ee535ec (diff)
downloadFreeBSD-src-92ba0082b7eb4da299f61cebe57aa25491c5882f.zip
FreeBSD-src-92ba0082b7eb4da299f61cebe57aa25491c5882f.tar.gz
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
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_output.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index d2da01f..9b532c3 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -2764,13 +2764,7 @@ ieee80211_beacon_alloc(struct ieee80211_node *ni,
*(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;
OpenPOWER on IntegriCloud