* + net-wireless-marvell-use-time_is_before_jiffies-instead-of-open-coding-it.patch added to -mm tree
@ 2022-04-22 20:37 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2022-04-22 20:37 UTC (permalink / raw)
To: mm-commits, zheyuma97, sharvari.harisangam, pabeni, kvalo, kuba,
keescook, huxinming820, ganapathi017, davem, buytenh, amitkarwar,
wangqing, akpm
The patch titled
Subject: net: wireless: marvell: use time_is_before_jiffies() instead of open coding it
has been added to the -mm tree. Its filename is
net-wireless-marvell-use-time_is_before_jiffies-instead-of-open-coding-it.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/net-wireless-marvell-use-time_is_before_jiffies-instead-of-open-coding-it.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/net-wireless-marvell-use-time_is_before_jiffies-instead-of-open-coding-it.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Wang Qing <wangqing@vivo.com>
Subject: net: wireless: marvell: use time_is_before_jiffies() instead of open coding it
Use the helper function time_is_{before,after}_jiffies() to improve code
readability.
Link: https://lkml.kernel.org/r/1650621172-66967-8-git-send-email-wangqing@vivo.com
Signed-off-by: Wang Qing <wangqing@vivo.com>
Cc: Amitkumar Karwar <amitkarwar@gmail.com>
Cc: Ganapathi Bhat <ganapathi017@gmail.com>
Cc: Sharvari Harisangam <sharvari.harisangam@nxp.com>
Cc: Xinming Hu <huxinming820@gmail.com>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Zheyu Ma <zheyuma97@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/net/wireless/marvell/mwifiex/tdls.c | 4 ++--
drivers/net/wireless/marvell/mwl8k.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
--- a/drivers/net/wireless/marvell/mwifiex/tdls.c~net-wireless-marvell-use-time_is_before_jiffies-instead-of-open-coding-it
+++ a/drivers/net/wireless/marvell/mwifiex/tdls.c
@@ -1436,8 +1436,8 @@ void mwifiex_check_auto_tdls(struct time
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_is_before_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;
--- a/drivers/net/wireless/marvell/mwl8k.c~net-wireless-marvell-use-time_is_before_jiffies-instead-of-open-coding-it
+++ a/drivers/net/wireless/marvell/mwl8k.c
@@ -24,6 +24,7 @@
#include <linux/moduleparam.h>
#include <linux/firmware.h>
#include <linux/workqueue.h>
+#include <linux/jiffies.h>
#define MWL8K_DESC "Marvell TOPDOG(R) 802.11 Wireless Network Driver"
#define MWL8K_NAME KBUILD_MODNAME
@@ -1880,7 +1881,7 @@ static inline void mwl8k_tx_count_packet
* packets ever exceeds the ampdu_min_traffic threshold, we will allow
* an ampdu stream to be started.
*/
- if (jiffies - tx_stats->start_time > HZ) {
+ if (time_is_before_jiffies(tx_stats->start_time + HZ)) {
tx_stats->pkts = 0;
tx_stats->start_time = 0;
} else
_
Patches currently in -mm which might be from wangqing@vivo.com are
block-xen-use-time_is_before_eq_jiffies-instead-of-open-coding-it.patch
gpu-drm-i915-use-time_is_after_jiffies-instead-of-open-coding-it.patch
gpu-drm-radeon-use-time_is_before_jiffies-instead-of-open-coding-it.patch
hid-use-time_is_after_jiffies-instead-of-open-coding-it.patch
md-use-time_is_before_eq_jiffies-instead-of-open-coding-it.patch
net-wireless-marvell-use-time_is_before_jiffies-instead-of-open-coding-it.patch
scsi-bfa-use-time_is_before_jiffies-instead-of-open-coding-it.patch
timekeeping-use-time_is_before_jiffies-instead-of-open-coding-it.patch
net-decnet-use-time_is_before_jiffies-instead-of-open-coding-it.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-22 21:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-22 20:37 + net-wireless-marvell-use-time_is_before_jiffies-instead-of-open-coding-it.patch added to -mm tree Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).