netgraph: Disable unused structs.

This needs recheck. While there, document that musycc and if_mn requires netgraph and are not compatible with netgraph7.
DragonFlyBSD · Jan 21, 2018 · e535ebf · e535ebf
1 parent ee46a57
commit e535ebf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/sys/conf/files b/sys/conf/files
@@ -1154,7 +1154,7 @@ mxge_rss_ethp_z8e.fw	optional mxgefw					\
 	clean		"mxge_rss_ethp_z8e.fw"
 net/zlib.c			optional mxge pci
 dev/netif/my/if_my.c		optional my
-dev/misc/musycc/musycc.c	optional musycc
+dev/misc/musycc/musycc.c	optional musycc netgraph
 dev/netif/nge/if_nge.c		optional nge
 dev/misc/nmdm/nmdm.c		optional nmdm
 dev/netif/oce/oce_hw.c		optional oce pci
@@ -1920,7 +1920,7 @@ dev/video/vga/vga_switcheroo.c	optional vga_switcheroo
 dev/netif/dc/if_dc.c		optional dc
 dev/netif/de/if_de.c		optional de
 dev/netif/pcn/if_pcn.c		optional pcn
-dev/netif/mn/if_mn.c		optional mn
+dev/netif/mn/if_mn.c		optional mn netgraph
 dev/netif/re/if_re.c		optional re
 dev/netif/re/re.c		optional re
 dev/netif/rl/if_rl.c		optional rl

diff --git a/sys/netgraph/netgraph/ng_base.c b/sys/netgraph/netgraph/ng_base.c
@@ -175,6 +175,7 @@ static const struct ng_parse_type ng_generic_nodeinfoarray_type = {
 	&ng_nodeinfoarray_type_info
 };
 
+#if 0 /* unused */
 /* Array type for a variable length array of struct typelist */
 static const struct ng_parse_array_info ng_typeinfoarray_type_info = {
 	&ng_generic_typeinfo_type,
@@ -184,6 +185,7 @@ static const struct ng_parse_type ng_generic_typeinfoarray_type = {
 	&ng_parse_array_type,
 	&ng_typeinfoarray_type_info
 };
+#endif
 
 /* Array type for array of struct linkinfo in struct hooklist */
 static const struct ng_parse_array_info ng_generic_linkinfo_array_type_info = {
@@ -195,7 +197,9 @@ static const struct ng_parse_type ng_generic_linkinfo_array_type = {
 	&ng_generic_linkinfo_array_type_info
 };
 
+#if 0 /* unused */
 DEFINE_PARSE_STRUCT_TYPE(typelist, TYPELIST, (&ng_generic_nodeinfoarray_type));
+#endif
 DEFINE_PARSE_STRUCT_TYPE(hooklist, HOOKLIST,
 	(&ng_generic_nodeinfo_type, &ng_generic_linkinfo_array_type));
 DEFINE_PARSE_STRUCT_TYPE(listnodes, LISTNODES,

diff --git a/sys/netgraph7/netgraph/ng_base.c b/sys/netgraph7/netgraph/ng_base.c
@@ -427,6 +427,7 @@ static const struct ng_parse_type ng_generic_nodeinfoarray_type = {
 	&ng_nodeinfoarray_type_info
 };
 
+#if 0 /* unused */
 /* Array type for a variable length array of struct typelist */
 static const struct ng_parse_array_info ng_typeinfoarray_type_info = {
 	&ng_generic_typeinfo_type,
@@ -436,6 +437,7 @@ static const struct ng_parse_type ng_generic_typeinfoarray_type = {
 	&ng_parse_array_type,
 	&ng_typeinfoarray_type_info
 };
+#endif
 
 /* Array type for array of struct linkinfo in struct hooklist */
 static const struct ng_parse_array_info ng_generic_linkinfo_array_type_info = {
@@ -447,7 +449,9 @@ static const struct ng_parse_type ng_generic_linkinfo_array_type = {
 	&ng_generic_linkinfo_array_type_info
 };
 
+#if 0 /* unused */
 DEFINE_PARSE_STRUCT_TYPE(typelist, TYPELIST, (&ng_generic_typeinfoarray_type));
+#endif
 DEFINE_PARSE_STRUCT_TYPE(hooklist, HOOKLIST,
 	(&ng_generic_nodeinfo_type, &ng_generic_linkinfo_array_type));
 DEFINE_PARSE_STRUCT_TYPE(listnodes, LISTNODES,