The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=61ab88d873301f8cec91729a312c322e11422f46
commit 61ab88d873301f8cec91729a312c322e11422f46 Author: Kristof Provost <[email protected]> AuthorDate: 2022-10-07 17:10:01 +0000 Commit: Kristof Provost <[email protected]> CommitDate: 2022-10-07 17:10:01 +0000 if_ovpn: remove an incorrect assertion netisr_dispatch() can fail, especially when under high traffic loads. This isn't a fatal error, so simply don't check the return value. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 16def82c6071..55da53ae3eb6 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -1419,7 +1419,6 @@ ovpn_finish_rx(struct ovpn_softc *sc, struct mbuf *m, struct rm_priotracker *_ovpn_lock_trackerp) { uint32_t af; - int ret __diagused; OVPN_RASSERT(sc); NET_EPOCH_ASSERT(); @@ -1461,9 +1460,7 @@ ovpn_finish_rx(struct ovpn_softc *sc, struct mbuf *m, af = ovpn_get_af(m); if (af != 0) { BPF_MTAP2(sc->ifp, &af, sizeof(af), m); - ret = netisr_dispatch(af == AF_INET ? NETISR_IP : NETISR_IPV6, - m); - MPASS(ret == 0); + netisr_dispatch(af == AF_INET ? NETISR_IP : NETISR_IPV6, m); } else { OVPN_COUNTER_ADD(sc, lost_data_pkts_in, 1); m_freem(m);
