summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorozaki-r <ozaki-r@NetBSD.org>2022-10-28 05:20:08 +0000
committerozaki-r <ozaki-r@NetBSD.org>2022-10-28 05:20:08 +0000
commit46d75a7bfa16c6249bf090a1a4d6862d92d3a8e0 (patch)
tree45e9c3595c862846fc019384d08e2a95d211a33d /sys/net
parent140683a5e6f35842e5eed3c33780e49d9bf8a812 (diff)
Adjust pf, wg, dccp and sctp for struct inpcb integration
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_wg.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/net/if_wg.c b/sys/net/if_wg.c
index 11838decc9b..d1c8f7db483 100644
--- a/sys/net/if_wg.c
+++ b/sys/net/if_wg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wg.c,v 1.69 2022/03/25 08:57:50 hannken Exp $ */
+/* $NetBSD: if_wg.c,v 1.70 2022/10/28 05:20:08 ozaki-r Exp $ */
/*
* Copyright (C) Ryota Ozaki <ozaki.ryota@gmail.com>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.69 2022/03/25 08:57:50 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.70 2022/10/28 05:20:08 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq_enabled.h"
@@ -3266,12 +3266,7 @@ wg_socreate(struct wg_softc *wg, int af, struct socket **sop)
so->so_upcallarg = wg;
so->so_upcall = wg_so_upcall;
so->so_rcv.sb_flags |= SB_UPCALL;
- if (af == AF_INET)
- in_pcb_register_overudp_cb(sotoinpcb(so), wg_overudp_cb, wg);
-#if INET6
- else
- in6_pcb_register_overudp_cb(sotoin6pcb(so), wg_overudp_cb, wg);
-#endif
+ in_pcb_register_overudp_cb(sotoinpcb(so), wg_overudp_cb, wg);
sounlock(so);
*sop = so;
@@ -3924,7 +3919,7 @@ wg_send_udp(struct wg_peer *wgp, struct mbuf *m)
error = udp_send(so, m, wgsatosa(wgsa), NULL, curlwp);
} else {
#ifdef INET6
- error = udp6_output(sotoin6pcb(so), m, wgsatosin6(wgsa),
+ error = udp6_output(sotoinpcb(so), m, wgsatosin6(wgsa),
NULL, curlwp);
#else
m_freem(m);