From e9a0e3e03b5bad2e9e105d6099ba10c81e65f75f Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Thu, 24 Sep 2009 12:21:01 +0200 Subject: [PATCH] --- yaml --- r: 170587 b: refs/heads/master c: 7c89606e24cdabaceb8ca9b3c7ab866c6bcc9e38 h: refs/heads/master i: 170585: 5ca247000eaf7c9dfab685b95847de48dd5ba322 170583: 294d4c76d7671c4fdd117a9dc514727de6e3b820 v: v3 --- [refs] | 2 +- trunk/include/linux/nl80211.h | 2 ++ trunk/net/wireless/nl80211.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e0032951d5dd..8c3d73fe6045 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7976b4263cb05dc638297d35f2a42375090ebaff +refs/heads/master: 7c89606e24cdabaceb8ca9b3c7ab866c6bcc9e38 diff --git a/trunk/include/linux/nl80211.h b/trunk/include/linux/nl80211.h index a8d71ed43a0e..50afca3dcff1 100644 --- a/trunk/include/linux/nl80211.h +++ b/trunk/include/linux/nl80211.h @@ -1277,6 +1277,7 @@ enum nl80211_channel_type { * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon * in unspecified units, scaled to 0..100 (u8) * @NL80211_BSS_STATUS: status, if this BSS is "used" + * @NL80211_BSS_SEEN_MS_AGO: age of this BSS entry in ms * @__NL80211_BSS_AFTER_LAST: internal * @NL80211_BSS_MAX: highest BSS attribute */ @@ -1291,6 +1292,7 @@ enum nl80211_bss { NL80211_BSS_SIGNAL_MBM, NL80211_BSS_SIGNAL_UNSPEC, NL80211_BSS_STATUS, + NL80211_BSS_SEEN_MS_AGO, /* keep last */ __NL80211_BSS_AFTER_LAST, diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index eddab097435c..e0ecc9f153d4 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -3105,6 +3105,8 @@ static int nl80211_send_bss(struct sk_buff *msg, u32 pid, u32 seq, int flags, NLA_PUT_U16(msg, NL80211_BSS_BEACON_INTERVAL, res->beacon_interval); NLA_PUT_U16(msg, NL80211_BSS_CAPABILITY, res->capability); NLA_PUT_U32(msg, NL80211_BSS_FREQUENCY, res->channel->center_freq); + NLA_PUT_U32(msg, NL80211_BSS_SEEN_MS_AGO, + jiffies_to_msecs(jiffies - intbss->ts)); switch (rdev->wiphy.signal_type) { case CFG80211_SIGNAL_TYPE_MBM: