git: 39455b3d3771 - stable/13 - wg: Drop the compat shim for sbcreatecontrol().

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Tue, 24 Jan 2023 05:43:11 UTC
The branch stable/13 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=39455b3d3771815daaa62c8ecf4527b56a2e8d14

commit 39455b3d3771815daaa62c8ecf4527b56a2e8d14
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-11-11 22:18:48 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-01-24 04:57:11 +0000

    wg: Drop the compat shim for sbcreatecontrol().
    
    I had to make a few other changes when merging the driver to stable/13
    anyway, so adjusting this as well isn't really a big deal.
    
    MFC after:      3 days
    
    (cherry picked from commit 573bd1fcf532eae35ac30d6aa2c6ff4985a60fe8)
---
 sys/dev/wg/compat.h | 7 -------
 sys/dev/wg/if_wg.c  | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/sys/dev/wg/compat.h b/sys/dev/wg/compat.h
index 29f6ea92a50e..72bbf8c3571d 100644
--- a/sys/dev/wg/compat.h
+++ b/sys/dev/wg/compat.h
@@ -7,11 +7,4 @@
  * It is different from support.h, which is for code that is not _yet_ upstream.
  */
 
-#include <sys/param.h>
-
 #define COMPAT_NEED_BLAKE2S
-
-#if __FreeBSD_version < 1400059
-#include <sys/sockbuf.h>
-#define sbcreatecontrol(a, b, c, d, e) sbcreatecontrol(a, b, c, d)
-#endif
diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c
index ef4df5c0021e..94395c86f370 100644
--- a/sys/dev/wg/if_wg.c
+++ b/sys/dev/wg/if_wg.c
@@ -863,13 +863,13 @@ wg_send(struct wg_softc *sc, struct wg_endpoint *e, struct mbuf *m)
 		if (e->e_local.l_in.s_addr != INADDR_ANY)
 			control = sbcreatecontrol((caddr_t)&e->e_local.l_in,
 			    sizeof(struct in_addr), IP_SENDSRCADDR,
-			    IPPROTO_IP, M_NOWAIT);
+			    IPPROTO_IP);
 #ifdef INET6
 	} else if (e->e_remote.r_sa.sa_family == AF_INET6) {
 		if (!IN6_IS_ADDR_UNSPECIFIED(&e->e_local.l_in6))
 			control = sbcreatecontrol((caddr_t)&e->e_local.l_pktinfo6,
 			    sizeof(struct in6_pktinfo), IPV6_PKTINFO,
-			    IPPROTO_IPV6, M_NOWAIT);
+			    IPPROTO_IPV6);
 #endif
 	} else {
 		m_freem(m);