Merge: sctp: do not check hb_timer.expires when resetting hb_timer

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2018

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2167094
Tested: bug reproducer

Conflicts:
  - Context difference due to missing 8032bf1 in RHEL-9.

Signed-off-by: Xin Long <lxin@redhat.com>

Approved-by: Andrea Claudi <aclaudi@redhat.com>
Approved-by: Florian Westphal <fwestpha@redhat.com>

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>

Author: Herton R. Krzesinski

net/sctp/transport.c

@@ -196,9 +196,7 @@ void sctp_transport_reset_hb_timer(struct sctp_transport *transport)
 
 	/* When a data chunk is sent, reset the heartbeat interval.  */
 	expires = jiffies + sctp_transport_timeout(transport);
-	if ((time_before(transport->hb_timer.expires, expires) ||
-	     !timer_pending(&transport->hb_timer)) &&
-	    !mod_timer(&transport->hb_timer,
+	if (!mod_timer(&transport->hb_timer,
 		       expires + prandom_u32_max(transport->rto)))
 		sctp_transport_hold(transport);
 }