From ba27fc0d4109b24d18062062c34b218b73438fe5 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@laptop2.(none)>
Date: Fri, 10 Sep 2010 22:41:30 -0700
Subject: [PATCH] build - Fix netgraph

* Some source files were missing newly required includes for their
  use of the mplock and socketvar2.h inlines.

Reported-by: lentferj
---
 sys/netgraph/ksocket/ng_ksocket.c | 4 +++-
 sys/netgraph/netgraph/ng_base.c   | 1 +
 sys/netgraph/socket/ng_socket.c   | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys/netgraph/ksocket/ng_ksocket.c b/sys/netgraph/ksocket/ng_ksocket.c
index edcddd2bbf..0ada544ec5 100644
--- a/sys/netgraph/ksocket/ng_ksocket.c
+++ b/sys/netgraph/ksocket/ng_ksocket.c
@@ -59,10 +59,12 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/socketops.h>
-#include <sys/thread2.h>
 #include <sys/uio.h>
 #include <sys/un.h>
 
+#include <sys/thread2.h>
+#include <sys/socketvar2.h>
+
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
 #include <netgraph/ng_parse.h>
diff --git a/sys/netgraph/netgraph/ng_base.c b/sys/netgraph/netgraph/ng_base.c
index dad04926cf..c17a4ad149 100644
--- a/sys/netgraph/netgraph/ng_base.c
+++ b/sys/netgraph/netgraph/ng_base.c
@@ -62,6 +62,7 @@
 
 #include <sys/thread2.h>
 #include <sys/msgport2.h>
+#include <sys/mplock2.h>
 
 #include <net/netisr.h>
 
diff --git a/sys/netgraph/socket/ng_socket.c b/sys/netgraph/socket/ng_socket.c
index c2d63173eb..45654053a3 100644
--- a/sys/netgraph/socket/ng_socket.c
+++ b/sys/netgraph/socket/ng_socket.c
@@ -64,10 +64,13 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#include <sys/thread2.h>
 #ifdef NOTYET
 #include <sys/vnode.h>
 #endif
+
+#include <sys/thread2.h>
+#include <sys/socketvar2.h>
+
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
 #include "ng_socketvar.h"
-- 
2.41.0