aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAssaf Krauss <assaf.krauss@intel.com>2008-06-30 05:23:16 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-30 17:37:42 -0400
commit4faeb86070c38c0df9f5a23c3f6acf5538492a33 (patch)
tree9e160ec6a76e4396bd8ee5053d59d83005be8a9b /net
parent052ec3f13973c789c89068573d3b06c983711d81 (diff)
mac80211: add beacon timestamp to beacon template in IBSS
This patch adds a beacon timestamp to the beacon template used in IBSS mode. This way the underlying driver can update its TSF accordingly. According the spec station should adopt the highest TSF from an incoming beacons in the cell. Signed-off-by: Assaf Krauss <assaf.krauss@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 1e4054b273dd..0a310d09ab07 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2503,6 +2503,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
2503 memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN); 2503 memcpy(mgmt->bssid, ifsta->bssid, ETH_ALEN);
2504 mgmt->u.beacon.beacon_int = 2504 mgmt->u.beacon.beacon_int =
2505 cpu_to_le16(local->hw.conf.beacon_int); 2505 cpu_to_le16(local->hw.conf.beacon_int);
2506 mgmt->u.beacon.timestamp = cpu_to_le64(bss->timestamp);
2506 mgmt->u.beacon.capab_info = cpu_to_le16(bss->capability); 2507 mgmt->u.beacon.capab_info = cpu_to_le16(bss->capability);
2507 2508
2508 pos = skb_put(skb, 2 + ifsta->ssid_len); 2509 pos = skb_put(skb, 2 + ifsta->ssid_len);