diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 13:47:56 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 13:47:56 +0200 |
| commit | 4f3a08cd3b023ee3f0410c1ef801c8ad76a761a0 (patch) | |
| tree | 74ee931d156540865ba078d6d2b8be16df4fb974 /drivers/net/wireless | |
| parent | 22443056035e24c2df98f812a7218596ca312a84 (diff) | |
| parent | 31cdcb6d430f07760dd2f540a354b11e6bb6a4a4 (diff) | |
Merge tag 'v5.4.151' into 5.4-2.3.x-imx
This is the 5.4.151 stable release
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 1033513d3d9d..07b070b14d75 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -1603,8 +1603,8 @@ mac80211_hwsim_beacon(struct hrtimer *timer) bcn_int -= data->bcn_delta; data->bcn_delta = 0; } - hrtimer_forward(&data->beacon_timer, hrtimer_get_expires(timer), - ns_to_ktime(bcn_int * NSEC_PER_USEC)); + hrtimer_forward_now(&data->beacon_timer, + ns_to_ktime(bcn_int * NSEC_PER_USEC)); return HRTIMER_RESTART; } |