diff mbox series

[Openvpn-devel,ovpn-net-next,2/2] ovpn: drop useless reg_state check in keepalive worker

Message ID 20250430123250.8627-2-a@unstable.cc
State Accepted
Delegated to: Antonio Quartulli
Headers show
Series [Openvpn-devel,ovpn-net-next,1/2] ovpn: don't access sk after release | expand

Commit Message

Antonio Quartulli April 30, 2025, 12:32 p.m. UTC 
From: Antonio Quartulli <antonio@openvpn.net>

The keepalive worker is cancelled before calling
unregister_netdevice_queue(), therefore it will never
hit a situation where the reg_state can be different
than NETDEV_REGISTERED.

For this reason, checking reg_state is useless and the
condition can be removed.

Signed-off-by: Antonio Quartulli <antonio@openvpn.net>
---
 drivers/net/ovpn/peer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Antonio Quartulli May 8, 2025, 11:25 a.m. UTC | #1 
On 30/04/2025 14:32, Antonio Quartulli wrote:
> From: Antonio Quartulli <antonio@openvpn.net>
> 
> The keepalive worker is cancelled before calling
> unregister_netdevice_queue(), therefore it will never
> hit a situation where the reg_state can be different
> than NETDEV_REGISTERED.
> 
> For this reason, checking reg_state is useless and the
> condition can be removed.
> 
> Signed-off-by: Antonio Quartulli <antonio@openvpn.net>

Merged to main, commit id 9149a0a9a8f9

Thanks
diff mbox series

Patch

diff --git a/drivers/net/ovpn/peer.c b/drivers/net/ovpn/peer.c
index a37f89fffb02..24eb9d81429e 100644
--- a/drivers/net/ovpn/peer.c
+++ b/drivers/net/ovpn/peer.c
@@ -1353,8 +1353,7 @@  void ovpn_peer_keepalive_work(struct work_struct *work)
 	}
 
 	/* prevent rearming if the interface is being destroyed */
-	if (next_run > 0 &&
-	    READ_ONCE(ovpn->dev->reg_state) == NETREG_REGISTERED) {
+	if (next_run > 0) {
 		netdev_dbg(ovpn->dev,
 			   "scheduling keepalive work: now=%llu next_run=%llu delta=%llu\n",
 			   next_run, now, next_run - now);