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

[PATCH v3] 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. 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(-)

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;
-- 
2.39.0

Re: [v3] wifi: mwifiex: Convert to use jiffies macro

Posted by Kalle Valo 1 year, 5 months ago

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

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20240823070320.430753-1-chenyufan@vivo.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
https://docs.kernel.org/process/submitting-patches.html

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

Posted by Brian Norris 1 year, 5 months ago

On Fri, Aug 23, 2024 at 03:03:19PM +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. change the type of mwifiex_auto_tdls_peer::rssi_jiffies to
> unsigned long.
> 
> Signed-off-by: Chen Yufan <chenyufan@vivo.com>

Changelog questions aside, this looks fine to me:

Acked-by: Brian Norris <briannorris@chromium.org>

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

Posted by 陈玉凡 1 year, 5 months ago

在 2024/8/24 1:01, Brian Norris 写道:
> On Fri, Aug 23, 2024 at 03:03:19PM +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. change the type of mwifiex_auto_tdls_peer::rssi_jiffies to
>> unsigned long.
>>
>> Signed-off-by: Chen Yufan <chenyufan@vivo.com>
> Changelog questions aside, this looks fine to me:
>
> Acked-by: Brian Norris <briannorris@chromium.org>

Thanks, I will pay attention to this question next time.

-Chen

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

Posted by Francesco Dolcini 1 year, 5 months ago

On Mon, Aug 26, 2024 at 03:18:28AM +0000, 陈玉凡 wrote:
> 在 2024/8/24 1:01, Brian Norris 写道:
> > On Fri, Aug 23, 2024 at 03:03:19PM +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. change the type of mwifiex_auto_tdls_peer::rssi_jiffies to
> >> unsigned long.
> >>
> >> Signed-off-by: Chen Yufan <chenyufan@vivo.com>
> > Changelog questions aside, this looks fine to me:
> >
> > Acked-by: Brian Norris <briannorris@chromium.org>
> 
> Thanks, I will pay attention to this question next time.

You should just send a v4 with this addressed and add the acked-by from Brian
while doing it.

Francesco

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

Posted by Francesco Dolcini 1 year, 5 months ago

Hello Chen,
thanks for your patch


Il 23 agosto 2024 09:03:19 CEST, Chen Yufan <chenyufan@vivo.com> ha scritto:
>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.

The patch changelog should not be part of the commit message, you should have it afterwards.

Francesco