diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-11-08 11:37:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-08 11:37:24 -0800 |
| commit | b05f5b4a9b10a7d60411a279322f513b4a8fa340 (patch) | |
| tree | 4867f9e62dcb8e91ddec2fb02c6552c8988ed594 /net | |
| parent | net: ethernet: octeon_mgmt: Account for second possible VLAN header (diff) | |
| parent | mac80211: fix station inactive_time shortly after boot (diff) | |
| download | linux-dev-b05f5b4a9b10a7d60411a279322f513b4a8fa340.tar.xz linux-dev-b05f5b4a9b10a7d60411a279322f513b4a8fa340.zip | |
Merge tag 'mac80211-for-net-2019-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Three small fixes:
* we hit a failure path bug related to
ieee80211_txq_setup_flows()
* also use kvmalloc() to make that less likely
* fix a timing value shortly after boot (during
INITIAL_JIFFIES)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/main.c | 2 | ||||
| -rw-r--r-- | net/mac80211/sta_info.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index aba094b4ccfc..2d05c4cfaf6d 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1292,8 +1292,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ieee80211_remove_interfaces(local); fail_rate: rtnl_unlock(); - ieee80211_led_exit(local); fail_flows: + ieee80211_led_exit(local); destroy_workqueue(local->workqueue); fail_workqueue: wiphy_unregister(local->hw.wiphy); diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index bd11fef2139f..8d3a2389b055 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2457,7 +2457,8 @@ unsigned long ieee80211_sta_last_active(struct sta_info *sta) { struct ieee80211_sta_rx_stats *stats = sta_get_last_rx_stats(sta); - if (time_after(stats->last_rx, sta->status_stats.last_ack)) + if (!sta->status_stats.last_ack || + time_after(stats->last_rx, sta->status_stats.last_ack)) return stats->last_rx; return sta->status_stats.last_ack; } |