lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cfg80211: clarify timestamp in cfg80211_inform_bss

Browse Source 
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>
This commit is contained in:
Johannes Berg
2012-03-13 13:57:04 +01:00
committed by John W. Linville
parent 8e6cffb3b4
commit 7b8bcff2e0
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/cfg80211.h
View File

@@ -2697,7 +2697,7 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
* @wiphy: the wiphy reporting the BSS * @wiphy: the wiphy reporting the BSS
* @channel: The channel the frame was received on * @channel: The channel the frame was received on
* @bssid: the BSSID of the BSS * @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 * @capability: the capability field sent by the peer
* @beacon_interval: the beacon interval announced by the peer * @beacon_interval: the beacon interval announced by the peer
* @ie: additional IEs sent 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 struct cfg80211_bss * __must_check
cfg80211_inform_bss(struct wiphy *wiphy, cfg80211_inform_bss(struct wiphy *wiphy,
struct ieee80211_channel *channel, struct ieee80211_channel *channel,
const u8 *bssid, const u8 *bssid, u64 tsf, u16 capability,
u64 timestamp, u16 capability, u16 beacon_interval, u16 beacon_interval, const u8 *ie, size_t ielen,
const u8 *ie, size_t ielen,
s32 signal, gfp_t gfp); s32 signal, gfp_t gfp);
struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy, struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy,

7
net/wireless/scan.c
View File

@@ -734,9 +734,8 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev,
struct cfg80211_bss* struct cfg80211_bss*
cfg80211_inform_bss(struct wiphy *wiphy, cfg80211_inform_bss(struct wiphy *wiphy,
struct ieee80211_channel *channel, struct ieee80211_channel *channel,
const u8 *bssid, const u8 *bssid, u64 tsf, u16 capability,
u64 timestamp, u16 capability, u16 beacon_interval, u16 beacon_interval, const u8 *ie, size_t ielen,
const u8 *ie, size_t ielen,
s32 signal, gfp_t gfp) s32 signal, gfp_t gfp)
{ {
struct cfg80211_internal_bss *res; struct cfg80211_internal_bss *res;
@@ -758,7 +757,7 @@ cfg80211_inform_bss(struct wiphy *wiphy,
memcpy(res->pub.bssid, bssid, ETH_ALEN); memcpy(res->pub.bssid, bssid, ETH_ALEN);
res->pub.channel = channel; res->pub.channel = channel;
res->pub.signal = signal; res->pub.signal = signal;
res->pub.tsf = timestamp; res->pub.tsf = tsf;
res->pub.beacon_interval = beacon_interval; res->pub.beacon_interval = beacon_interval;
res->pub.capability = capability; res->pub.capability = capability;
/* /*