FreeBSD current socket-src changed. Wireguard not compiling.

[Michael Pro]

Tonight after updating kernel freebsd current I got coredump with
wireguard enabled kernel module.

As is
https://reviews.freebsd.org/D36232
 D36232 protosw: refactor protosw and domain static declaration and
load (freebsd.org)
in wireguard-freebsd/src/support.h
...
error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, nam);
...
replace to
...
error = solisten_proto_check(so);
...
Recompile - no more core dumps. All works now, perhaps...

Is this the right way to fix the problem? Is this enough or should we
wait for a full-scale refactoring of the code?

Thanks in advance for your reply.