Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b8bcff2 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8e6cffb3

include/net/cfg80211.h

+3 −4
Original line number Diff line number Diff line
@@ -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,

net/wireless/scan.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

	/*