Page MenuHomeFreeBSD
Files F108405426

D42179.diff
No OneTemporary
Actions

D42179.diff
View Options

diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c
--- a/sys/compat/linux/linux_netlink.c
+++ b/sys/compat/linux/linux_netlink.c
@@ -27,7 +27,6 @@
#include "opt_inet.h"
#include "opt_inet6.h"
-#include "opt_netlink.h"
#include <sys/types.h>
#include <sys/ck.h>
diff --git a/sys/conf/options b/sys/conf/options
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -472,7 +472,7 @@
MBUF_STRESS_TEST
MROUTING opt_mrouting.h
NFSLOCKD
-NETLINK opt_netlink.h
+NETLINK opt_global.h
PF_DEFAULT_TO_DROP opt_pf.h
ROUTE_MPATH opt_route.h
ROUTETABLES opt_route.h
diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile
--- a/sys/modules/carp/Makefile
+++ b/sys/modules/carp/Makefile
@@ -5,6 +5,6 @@
KMOD= carp
SRCS= ip_carp.c sha1.c
SRCS+= device_if.h bus_if.h vnode_if.h
-SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h opt_netlink.h
+SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/ktest/ktest/Makefile b/sys/modules/ktest/ktest/Makefile
--- a/sys/modules/ktest/ktest/Makefile
+++ b/sys/modules/ktest/ktest/Makefile
@@ -8,6 +8,5 @@
KMOD= ktest
SRCS= ktest.c
-SRCS+= opt_netlink.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/ktest/ktest_example/Makefile b/sys/modules/ktest/ktest_example/Makefile
--- a/sys/modules/ktest/ktest_example/Makefile
+++ b/sys/modules/ktest/ktest_example/Makefile
@@ -8,6 +8,5 @@
KMOD= ktest_example
SRCS= ktest_example.c
-SRCS+= opt_netlink.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/ktest/ktest_netlink_message_writer/Makefile b/sys/modules/ktest/ktest_netlink_message_writer/Makefile
--- a/sys/modules/ktest/ktest_netlink_message_writer/Makefile
+++ b/sys/modules/ktest/ktest_netlink_message_writer/Makefile
@@ -8,7 +8,6 @@
KMOD= ktest_netlink_message_writer
SRCS= ktest_netlink_message_writer.c
-SRCS+= opt_netlink.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -70,8 +70,7 @@
linux_vdso_selector_x86.c \
linux_x86.c \
linux_copyout.c \
- linux_netlink.c \
- opt_netlink.h
+ linux_netlink.c
.endif
.if ${MACHINE_CPUARCH} == "i386"
diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile
--- a/sys/modules/linux_common/Makefile
+++ b/sys/modules/linux_common/Makefile
@@ -7,8 +7,7 @@
KMOD= linux_common
SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \
linux_dummy.c linux_errno.c linux_netlink.c \
- linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h \
- opt_netlink.h
+ linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h
.if ${MACHINE_CPUARCH} == "amd64"
SRCS+= linux_x86.c linux_vdso_selector_x86.c
diff --git a/sys/modules/netlink/Makefile b/sys/modules/netlink/Makefile
--- a/sys/modules/netlink/Makefile
+++ b/sys/modules/netlink/Makefile
@@ -5,7 +5,7 @@
netlink_message_writer.c netlink_generic.c \
netlink_route.c route/iface.c route/iface_drivers.c route/neigh.c \
route/nexthop.c route/rt.c
-SRCS+= opt_inet.h opt_inet6.h opt_route.h opt_netlink.h
+SRCS+= opt_inet.h opt_inet6.h opt_route.h
CFLAGS+= -DNETLINK_MODULE
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -32,8 +32,6 @@
* @(#)if.c 8.5 (Berkeley) 1/9/95
*/
-#include "opt_netlink.h"
-
#include <sys/param.h>
#include <sys/eventhandler.h>
#include <sys/malloc.h>
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -46,7 +46,6 @@
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_kern_tls.h"
-#include "opt_netlink.h"
#include "opt_vlan.h"
#include "opt_ratelimit.h"
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -28,8 +28,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include "opt_bpf.h"
#include "opt_inet.h"
diff --git a/sys/netlink/ktest_netlink_message_writer.c b/sys/netlink/ktest_netlink_message_writer.c
--- a/sys/netlink/ktest_netlink_message_writer.c
+++ b/sys/netlink/ktest_netlink_message_writer.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <tests/ktest.h>
#include <sys/cdefs.h>
#include <sys/systm.h>
diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c
--- a/sys/netlink/netlink_domain.c
+++ b/sys/netlink/netlink_domain.c
@@ -30,7 +30,6 @@
* This file contains socket and protocol bindings for netlink.
*/
-#include "opt_netlink.h"
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c
--- a/sys/netlink/netlink_generic.c
+++ b/sys/netlink/netlink_generic.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ck.h>
diff --git a/sys/netlink/netlink_glue.c b/sys/netlink/netlink_glue.c
--- a/sys/netlink/netlink_glue.c
+++ b/sys/netlink/netlink_glue.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c
--- a/sys/netlink/netlink_io.c
+++ b/sys/netlink/netlink_io.c
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ck.h>
diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c
--- a/sys/netlink/netlink_message_writer.c
+++ b/sys/netlink/netlink_message_writer.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/malloc.h>
diff --git a/sys/netlink/netlink_module.c b/sys/netlink/netlink_module.c
--- a/sys/netlink/netlink_module.c
+++ b/sys/netlink/netlink_module.c
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c
--- a/sys/netlink/route/iface.c
+++ b/sys/netlink/route/iface.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c
--- a/sys/netlink/route/iface_drivers.c
+++ b/sys/netlink/route/iface_drivers.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
#include <sys/cdefs.h>
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c
--- a/sys/netlink/route/neigh.c
+++ b/sys/netlink/route/neigh.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c
--- a/sys/netlink/route/nexthop.c
+++ b/sys/netlink/route/nexthop.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c
--- a/sys/netlink/route/rt.c
+++ b/sys/netlink/route/rt.c
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c
--- a/sys/netpfil/pf/pf_nl.c
+++ b/sys/netpfil/pf/pf_nl.c
@@ -27,8 +27,6 @@
*
*/
-#include "opt_netlink.h"
-
#include <sys/cdefs.h>
#include <sys/param.h>
diff --git a/sys/tests/ktest.c b/sys/tests/ktest.c
--- a/sys/tests/ktest.c
+++ b/sys/tests/ktest.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
-#include "opt_netlink.h"
-
#include <sys/param.h>
#include <sys/refcount.h>
#include <sys/types.h>

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 25, 12:57 PM (17 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16143348
Default Alt Text
D42179.diff (7 KB)

Event Timeline