diff options
| author | Yan Zhen <yanzhen@vivo.com> | 2024-08-27 18:30:12 +0800 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-08-28 12:39:59 +0200 |
| commit | 8109b226f23af2b9f4a866196349992e5cdfc5d8 (patch) | |
| tree | 3a6ef5bb487099f6dfe843301e9a175243226675 | |
| parent | 67bb124cd9ae38870667e4f9c876ef8e0f82ec44 (diff) | |
| download | linux-8109b226f23af2b9f4a866196349992e5cdfc5d8.tar.gz linux-8109b226f23af2b9f4a866196349992e5cdfc5d8.tar.bz2 linux-8109b226f23af2b9f4a866196349992e5cdfc5d8.zip | |
wifi: mac80211: scan: Use max macro
When the original file is guaranteed to contain the minmax.h header
file and compile correctly, using the real macro is usually
more intuitive and readable.
Signed-off-by: Yan Zhen <yanzhen@vivo.com>
Link: https://patch.msgid.link/20240827103012.3853588-1-yanzhen@vivo.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/scan.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 3b2bde6360bc..14e18fd9e919 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -1013,10 +1013,8 @@ set_channel: */ if ((chan->flags & (IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_RADAR)) || !scan_req->n_ssids) { - *next_delay = msecs_to_jiffies(scan_req->duration) > - IEEE80211_PASSIVE_CHANNEL_TIME ? - msecs_to_jiffies(scan_req->duration) : - IEEE80211_PASSIVE_CHANNEL_TIME; + *next_delay = max(msecs_to_jiffies(scan_req->duration), + IEEE80211_PASSIVE_CHANNEL_TIME); local->next_scan_state = SCAN_DECISION; if (scan_req->n_ssids) set_bit(SCAN_BEACON_WAIT, &local->scanning); |