timers: no need to clear keepalive in persistent keepalive

We do this after sending the keepalive anyway.

This is something of a regression, though, since before we'd cancel and
then send, but now we send and then cancel, so it introduces a potential
race, but hopefully that isn't too big of a deal.

Kernel module commit a24b3e6e15ae1ea1291666e5da910caf43eedbaf

diff --git a/timers.go b/timers.go
index 75087cb275cdf17985918db51e546386f6087f57..ae206cdb72b31bb5c5007baf86862f055d92e118 100644 (file)
--- a/timers.go
+++ b/timers.go
@@ -134,9 +134,6 @@ func expiredZeroKeyMaterial(peer *Peer) {
 
 func expiredPersistentKeepalive(peer *Peer) {
        if peer.persistentKeepaliveInterval > 0 {
-               if peer.timersActive() {
-                       peer.timers.sendKeepalive.Del()
-               }
                peer.SendKeepalive()
        }
 }