| Message ID | 20240823070320.430753-1-chenyufan@vivo.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] wifi: mwifiex: Convert to use jiffies macro | expand |
Chen Yufan <chenyufan@vivo.com> wrote: > Use time_after macro instead of using jiffies directly to handle wraparound. > Change the type to to unsigned long to avoid unnecessary casts. > > Signed-off-by: Chen Yufan <chenyufan@vivo.com> > Acked-by: Brian Norris <briannorris@chromium.org> Patch applied to wireless-next.git, thanks. 97b766f989bc wifi: mwifiex: Convert to use jiffies macro
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h index 9024bb944..7398bacc1 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -799,7 +799,7 @@ struct mwifiex_auto_tdls_peer { u8 mac_addr[ETH_ALEN]; u8 tdls_status; int rssi; - long rssi_jiffies; + unsigned long rssi_jiffies; u8 failure_count; u8 do_discover; u8 do_setup; diff --git a/drivers/net/wireless/marvell/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c index 6c60621b6..7823e6769 100644 --- a/drivers/net/wireless/marvell/mwifiex/tdls.c +++ b/drivers/net/wireless/marvell/mwifiex/tdls.c @@ -1439,8 +1439,8 @@ void mwifiex_check_auto_tdls(struct timer_list *t) spin_lock_bh(&priv->auto_tdls_lock); list_for_each_entry(tdls_peer, &priv->auto_tdls_list, list) { - if ((jiffies - tdls_peer->rssi_jiffies) > - (MWIFIEX_AUTO_TDLS_IDLE_TIME * HZ)) { + if (time_after(jiffies, tdls_peer->rssi_jiffies + + MWIFIEX_AUTO_TDLS_IDLE_TIME * HZ)) { tdls_peer->rssi = 0; tdls_peer->do_discover = true; priv->check_tdls_tx = true;
Use time_after macro instead of using jiffies directly to handle wraparound. The modifications made compared to the previous version are as follows: 1. change the type of mwifiex_auto_tdls_peer::rssi_jiffies to unsigned long. Signed-off-by: Chen Yufan <chenyufan@vivo.com> --- drivers/net/wireless/marvell/mwifiex/main.h | 2 +- drivers/net/wireless/marvell/mwifiex/tdls.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)