cfg80211: clarify timestamp in cfg80211_inform_bss

This is intended to be the timestamp sent by the
peer in the beacon/probe response, not any form
of host timestamp. Clarify the documentation and
variable names.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 66f460325e240f1b6574a12cfc0d03102102aa02..69b7ad3a9925d37055b7ca0f4174066121f39ac7 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2697,7 +2697,7 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
  * @wiphy: the wiphy reporting the BSS
  * @channel: The channel the frame was received on
  * @bssid: the BSSID of the BSS
- * @timestamp: the TSF timestamp sent by the peer
+ * @tsf: the TSF sent by the peer in the beacon/probe response (or 0)
  * @capability: the capability field sent by the peer
  * @beacon_interval: the beacon interval announced by the peer
  * @ie: additional IEs sent by the peer
@@ -2713,9 +2713,8 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
 struct cfg80211_bss * __must_check
 cfg80211_inform_bss(struct wiphy *wiphy,
                    struct ieee80211_channel *channel,
-                   const u8 *bssid,
-                   u64 timestamp, u16 capability, u16 beacon_interval,
-                   const u8 *ie, size_t ielen,
+                   const u8 *bssid, u64 tsf, u16 capability,
+                   u16 beacon_interval, const u8 *ie, size_t ielen,
                    s32 signal, gfp_t gfp);
 
 struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy,

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index afde7e5f001057d84f8528dbd85ebc16c08bf92b..70faadf16a3265b2ba067160672c1b7a117eecf1 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -734,9 +734,8 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev,
 struct cfg80211_bss*
 cfg80211_inform_bss(struct wiphy *wiphy,
                    struct ieee80211_channel *channel,
-                   const u8 *bssid,
-                   u64 timestamp, u16 capability, u16 beacon_interval,
-                   const u8 *ie, size_t ielen,
+                   const u8 *bssid, u64 tsf, u16 capability,
+                   u16 beacon_interval, const u8 *ie, size_t ielen,
                    s32 signal, gfp_t gfp)
 {
        struct cfg80211_internal_bss *res;
@@ -758,7 +757,7 @@ cfg80211_inform_bss(struct wiphy *wiphy,
        memcpy(res->pub.bssid, bssid, ETH_ALEN);
        res->pub.channel = channel;
        res->pub.signal = signal;
-       res->pub.tsf = timestamp;
+       res->pub.tsf = tsf;
        res->pub.beacon_interval = beacon_interval;
        res->pub.capability = capability;
        /*