Remove net/raw_cb.h from includes and replace the RAWSNDQ, RAWRCVQ with

protocol specific ones.
OK mpi@

diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c
index 161a809..cba1d67 100644 (file)
--- a/sys/net/pfkeyv2.c
+++ b/sys/net/pfkeyv2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.c,v 1.188 2018/07/10 10:02:14 bluhm Exp $ */
+/* $OpenBSD: pfkeyv2.c,v 1.189 2018/07/10 20:28:34 claudio Exp $ */
 
 /*
  *     @(#)COPYRIGHT   1.1 (NRL) 17 January 1995
@@ -86,7 +86,6 @@
 #include <netinet/ip_ipsp.h>
 #include <net/pfkeyv2.h>
 #include <net/radix.h>
-#include <net/raw_cb.h>
 #include <netinet/ip_ah.h>
 #include <netinet/ip_esp.h>
 #include <netinet/ip_ipcomp.h>
@@ -97,6 +96,8 @@
 #include <net/pfvar.h>
 #endif
 
+#define        PFKEYSNDQ       8192
+#define        PFKEYRCVQ       8192
 
 static const struct sadb_alg ealgs[] = {
        { SADB_EALG_NULL, 0, 0, 0 },
@@ -269,7 +270,7 @@ pfkeyv2_attach(struct socket *so, int proto)
        so->so_pcb = kp;
        refcnt_init(&kp->kcb_refcnt);
 
-       error = soreserve(so, RAWSNDQ, RAWRCVQ);
+       error = soreserve(so, PFKEYSNDQ, PFKEYRCVQ);
        if (error) {
                free(kp, M_PCB, sizeof(struct pkpcb));
                return (error);

diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 2b6e0b7..cfd2856 100644 (file)
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtsock.c,v 1.278 2018/07/10 10:02:14 bluhm Exp $      */
+/*     $OpenBSD: rtsock.c,v 1.279 2018/07/10 20:28:34 claudio Exp $    */
 /*     $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $  */
 
 /*
@@ -76,7 +76,6 @@
 #include <net/if_dl.h>
 #include <net/if_var.h>
 #include <net/route.h>
-#include <net/raw_cb.h>
 
 #include <netinet/in.h>
 
@@ -95,6 +94,9 @@
 #include <sys/kernel.h>
 #include <sys/timeout.h>
 
+#define        ROUTESNDQ       8192
+#define        ROUTERCVQ       8192
+
 const struct sockaddr route_src = { 2, PF_ROUTE, };
 
 struct walkarg {
@@ -300,7 +302,7 @@ route_attach(struct socket *so, int proto)
        if (curproc == NULL)
                error = EACCES;
        else
-               error = soreserve(so, RAWSNDQ, RAWRCVQ);
+               error = soreserve(so, ROUTESNDQ, ROUTERCVQ);
        if (error) {
                free(rop, M_PCB, sizeof(struct rtpcb));
                return (error);