D51497.id159014.diff
No OneTemporary
Actions

Size

814 B

Referenced Files

None

Subscribers

None

D51497.id159014.diff
View Options

	diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c
	--- a/sys/net/if_ovpn.c
	+++ b/sys/net/if_ovpn.c
	@@ -372,33 +372,6 @@
	return (0);
	}

	-static bool
	-ovpn_has_peers(struct ovpn_softc *sc)
	-{
	- OVPN_ASSERT(sc);
	-
	- return (sc->peercount > 0);
	-}
	-
	-static void
	-ovpn_rele_so(struct ovpn_softc *sc)
	-{
	- bool has_peers;
	-
	- OVPN_WASSERT(sc);
	-
	- if (sc->so == NULL)
	- return;
	-
	- has_peers = ovpn_has_peers(sc);
	-
	- if (! has_peers) {
	- MPASS(sc->peercount == 0);
	- } else {
	- MPASS(sc->peercount > 0);
	- }
	-}
	-
	static void
	ovpn_notify_del_peer(struct ovpn_softc sc, struct ovpn_kpeer peer)
	{
	@@ -487,8 +460,6 @@
	ovpn_free_kkey_dir(peer->keys[i].decrypt);
	}

	- ovpn_rele_so(sc);
	-
	callout_stop(&peer->ping_send);
	callout_stop(&peer->ping_rcv);
	uma_zfree_pcpu(pcpu_zone_4, peer->last_active);