From 9d2a89e49f7aa2e38599e9ffa41306dabfcfd773 Mon Sep 17 00:00:00 2001 From: Rui Paulo Date: Mon, 9 Nov 2009 23:46:53 +0000 Subject: [PATCH] --- yaml --- r: 171737 b: refs/heads/master c: 36f0d5f537885179c8fa92a70d4fcfb3a336b082 h: refs/heads/master i: 171735: 89f3c082e87021525342b7bda19108daa9530c6c v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9087342bda44..6b988e2e633a 100644 --- 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 index 2f3345c5f7cf..3ad053f6de12 100644 --- 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 */