---

yaml --- r: 171737 b: refs/heads/master c: 36f0d5f h: refs/heads/master i: 171735: 89f3c08 v: v3
git-mirror · Nov 13, 2009 · 9d2a89e · 9d2a89e
1 parent 2fcb576
commit 9d2a89e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77fa76bb7f5589cd336e4da4a02e2d685b70ce0a
+refs/heads/master: 36f0d5f537885179c8fa92a70d4fcfb3a336b082
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
@@ -2148,7 +2148,7 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
 		    cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON);
 		memset(mgmt->da, 0xff, ETH_ALEN);
 		memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
-		/* BSSID is left zeroed, wildcard value */
+		memcpy(mgmt->bssid, sdata->dev->dev_addr, ETH_ALEN);
 		mgmt->u.beacon.beacon_int =
 			cpu_to_le16(sdata->vif.bss_conf.beacon_int);
 		mgmt->u.beacon.capab_info = 0x0; /* 0x0 for MPs */