[v2] wifi: mwifiex: Convert to use jiffies macro

[PATCH v2] wifi: mwifiex: Convert to use jiffies macro

Posted by Chen Yufan 1 year, 5 months ago

Use time_after macro instead of using
jiffies directly to handle wraparound.
The modifications made compared to the previous version are as follows:
1. Added a typecast to unsigned long for rssi_jiffies
to resolve the compilation error.

Signed-off-by: Chen Yufan <chenyufan@vivo.com>
---
 drivers/net/wireless/marvell/mwifiex/tdls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c
index 6c60621b6..e48e8affd 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, (unsigned long)tdls_peer->rssi_jiffies +
+					 MWIFIEX_AUTO_TDLS_IDLE_TIME * HZ)) {
 			tdls_peer->rssi = 0;
 			tdls_peer->do_discover = true;
 			priv->check_tdls_tx = true;
-- 
2.39.0

Re: [PATCH v2] wifi: mwifiex: Convert to use jiffies macro

Posted by Brian Norris 1 year, 5 months ago

On Thu, Aug 22, 2024 at 06:29:04PM +0800, Chen Yufan wrote:
> Use time_after macro instead of using
> jiffies directly to handle wraparound.
> The modifications made compared to the previous version are as follows:
> 1. Added a typecast to unsigned long for rssi_jiffies
> to resolve the compilation error.

Can we just change the type in mwifiex_auto_tdls_peer::rssi_jiffies?
Fewer casts is generally better.

Brian

> 
> Signed-off-by: Chen Yufan <chenyufan@vivo.com>
> ---
>  drivers/net/wireless/marvell/mwifiex/tdls.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/marvell/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c
> index 6c60621b6..e48e8affd 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, (unsigned long)tdls_peer->rssi_jiffies +
> +					 MWIFIEX_AUTO_TDLS_IDLE_TIME * HZ)) {
>  			tdls_peer->rssi = 0;
>  			tdls_peer->do_discover = true;
>  			priv->check_tdls_tx = true;
> -- 
> 2.39.0
>