* [PATCH 1/3] cfg80211: clean up cfg80211_inform_single_bss_frame_data()
@ 2019-07-03 13:38 Johannes Berg
2019-07-03 13:38 ` [PATCH 2/3] cfg80211: don't parse MBSSID if transmitting BSS isn't created Johannes Berg
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Johannes Berg @ 2019-07-03 13:38 UTC (permalink / raw)
To: linux-wireless; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
cfg80211_inform_single_bss_frame_data() doesn't need the
non_tx_data data argument since it's always NULL.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/wireless/scan.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index d66e6d4b7555..70d061ed9cb6 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1776,7 +1776,6 @@ static struct cfg80211_bss *
cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy,
struct cfg80211_inform_bss *data,
struct ieee80211_mgmt *mgmt, size_t len,
- struct cfg80211_non_tx_bss *non_tx_data,
gfp_t gfp)
{
struct cfg80211_internal_bss tmp = {}, *res;
@@ -1835,11 +1834,6 @@ cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy,
tmp.pub.chains = data->chains;
memcpy(tmp.pub.chain_signal, data->chain_signal, IEEE80211_MAX_CHAINS);
ether_addr_copy(tmp.parent_bssid, data->parent_bssid);
- if (non_tx_data) {
- tmp.pub.transmitted_bss = non_tx_data->tx_bss;
- tmp.pub.bssid_index = non_tx_data->bssid_index;
- tmp.pub.max_bssid_indicator = non_tx_data->max_bssid_indicator;
- }
signal_valid = abs(data->chan->center_freq - channel->center_freq) <=
wiphy->max_adj_channel_rssi_comp;
@@ -1877,7 +1871,7 @@ cfg80211_inform_bss_frame_data(struct wiphy *wiphy,
struct cfg80211_non_tx_bss non_tx_data;
res = cfg80211_inform_single_bss_frame_data(wiphy, data, mgmt,
- len, NULL, gfp);
+ len, gfp);
if (!res || !wiphy->support_mbssid ||
!cfg80211_find_ie(WLAN_EID_MULTIPLE_BSSID, ie, ielen))
return res;
--
2.17.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] cfg80211: don't parse MBSSID if transmitting BSS isn't created
2019-07-03 13:38 [PATCH 1/3] cfg80211: clean up cfg80211_inform_single_bss_frame_data() Johannes Berg
@ 2019-07-03 13:38 ` Johannes Berg
2019-07-03 13:38 ` [PATCH 3/3] cfg80211: give all multi-BSSID BSS entries the same timestamp Johannes Berg
2019-07-11 9:31 ` [PATCH 1/3] cfg80211: clean up cfg80211_inform_single_bss_frame_data() Sergey Matyukevich
2 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2019-07-03 13:38 UTC (permalink / raw)
To: linux-wireless; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
Don't parse the multi-BSSID structures if we couldn't even create
their transmitting BSS, this would confuse all of our tracking.
This also means that non_tx_data->tx_bss will never be NULL, so
we can clean up a little bit.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/wireless/scan.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 70d061ed9cb6..186ae1bb510a 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1440,7 +1440,7 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy,
regulatory_hint_found_beacon(wiphy, channel, gfp);
}
- if (non_tx_data && non_tx_data->tx_bss) {
+ if (non_tx_data) {
/* this is a nontransmitting bss, we need to add it to
* transmitting bss' list if it is not there
*/
@@ -1659,6 +1659,8 @@ cfg80211_inform_bss_data(struct wiphy *wiphy,
res = cfg80211_inform_single_bss_data(wiphy, data, ftype, bssid, tsf,
capability, beacon_interval, ie,
ielen, NULL, gfp);
+ if (!res)
+ return NULL;
non_tx_data.tx_bss = res;
cfg80211_parse_mbssid_data(wiphy, data, ftype, bssid, tsf,
beacon_interval, ie, ielen, &non_tx_data,
--
2.17.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] cfg80211: give all multi-BSSID BSS entries the same timestamp
2019-07-03 13:38 [PATCH 1/3] cfg80211: clean up cfg80211_inform_single_bss_frame_data() Johannes Berg
2019-07-03 13:38 ` [PATCH 2/3] cfg80211: don't parse MBSSID if transmitting BSS isn't created Johannes Berg
@ 2019-07-03 13:38 ` Johannes Berg
2019-07-11 9:31 ` [PATCH 1/3] cfg80211: clean up cfg80211_inform_single_bss_frame_data() Sergey Matyukevich
2 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2019-07-03 13:38 UTC (permalink / raw)
To: linux-wireless; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
If we just read jiffies over and over again, a non-transmitting
entry may have a newer timestamp than the transmitting one,
leading to possible confusion on expiry. Give them all the same
timestamp when creating them.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/wireless/scan.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 186ae1bb510a..a98dabab557a 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1368,6 +1368,7 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy,
struct cfg80211_internal_bss tmp = {}, *res;
int bss_type;
bool signal_valid;
+ unsigned long ts;
if (WARN_ON(!wiphy))
return NULL;
@@ -1390,8 +1391,11 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy,
tmp.ts_boottime = data->boottime_ns;
if (non_tx_data) {
tmp.pub.transmitted_bss = non_tx_data->tx_bss;
+ ts = bss_from_pub(non_tx_data->tx_bss)->ts;
tmp.pub.bssid_index = non_tx_data->bssid_index;
tmp.pub.max_bssid_indicator = non_tx_data->max_bssid_indicator;
+ } else {
+ ts = jiffies;
}
/*
@@ -1425,8 +1429,7 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy,
signal_valid = abs(data->chan->center_freq - channel->center_freq) <=
wiphy->max_adj_channel_rssi_comp;
- res = cfg80211_bss_update(wiphy_to_rdev(wiphy), &tmp, signal_valid,
- jiffies);
+ res = cfg80211_bss_update(wiphy_to_rdev(wiphy), &tmp, signal_valid, ts);
if (!res)
return NULL;
--
2.17.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] cfg80211: clean up cfg80211_inform_single_bss_frame_data()
2019-07-03 13:38 [PATCH 1/3] cfg80211: clean up cfg80211_inform_single_bss_frame_data() Johannes Berg
2019-07-03 13:38 ` [PATCH 2/3] cfg80211: don't parse MBSSID if transmitting BSS isn't created Johannes Berg
2019-07-03 13:38 ` [PATCH 3/3] cfg80211: give all multi-BSSID BSS entries the same timestamp Johannes Berg
@ 2019-07-11 9:31 ` Sergey Matyukevich
2 siblings, 0 replies; 4+ messages in thread
From: Sergey Matyukevich @ 2019-07-11 9:31 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, Johannes Berg
> From: Johannes Berg <johannes.berg@intel.com>
>
> cfg80211_inform_single_bss_frame_data() doesn't need the
> non_tx_data data argument since it's always NULL.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
For all 3 patches:
Reviewed-by: Sergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Regards,
Sergey
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-11 9:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-03 13:38 [PATCH 1/3] cfg80211: clean up cfg80211_inform_single_bss_frame_data() Johannes Berg
2019-07-03 13:38 ` [PATCH 2/3] cfg80211: don't parse MBSSID if transmitting BSS isn't created Johannes Berg
2019-07-03 13:38 ` [PATCH 3/3] cfg80211: give all multi-BSSID BSS entries the same timestamp Johannes Berg
2019-07-11 9:31 ` [PATCH 1/3] cfg80211: clean up cfg80211_inform_single_bss_frame_data() Sergey Matyukevich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).