From: Yan Zhen Date: Tue, 27 Aug 2024 10:30:12 +0000 (+0800) Subject: wifi: mac80211: scan: Use max macro X-Git-Tag: v6.12-rc1~232^2~101^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8109b226f23af2b9f4a866196349992e5cdfc5d8;p=thirdparty%2Fkernel%2Flinux.git 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 Link: https://patch.msgid.link/20240827103012.3853588-1-yanzhen@vivo.com Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 3b2bde6360bcb..14e18fd9e9191 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);