svn commit: r301117 - in projects/vnet/sys: contrib/ipfilter/netinet netpfil/ipfw netpfil/pf

[Bjoern A. Zeeb]

Author: bz
Date: Wed Jun  1 10:55:22 2016
New Revision: 301117
URL: https://svnweb.freebsd.org/changeset/base/301117

Log:
  Rename the remaining SI_SUB_FW to SI_SUB_PROTO_FIREWALL as the field was
  renamed in the upstream commit.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c
  projects/vnet/sys/netpfil/ipfw/dn_sched.h
  projects/vnet/sys/netpfil/ipfw/ip_dummynet.c
  projects/vnet/sys/netpfil/ipfw/ip_fw2.c
  projects/vnet/sys/netpfil/ipfw/ip_fw_nat.c
  projects/vnet/sys/netpfil/pf/pf_ioctl.c

Modified: projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c
==============================================================================
--- projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c	Wed Jun  1 10:24:08 2016	(r301116)
+++ projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c	Wed Jun  1 10:55:22 2016	(r301117)
@@ -287,7 +287,7 @@ static moduledata_t ipfiltermod = {
 };
 
 
-DECLARE_MODULE(ipfilter, ipfiltermod, SI_SUB_FW, SI_ORDER_ANY);
+DECLARE_MODULE(ipfilter, ipfiltermod, SI_SUB_PROTO_FIREWALL, SI_ORDER_ANY);
 #ifdef	MODULE_VERSION
 MODULE_VERSION(ipfilter, 1);
 #endif

Modified: projects/vnet/sys/netpfil/ipfw/dn_sched.h
==============================================================================
--- projects/vnet/sys/netpfil/ipfw/dn_sched.h	Wed Jun  1 10:24:08 2016	(r301116)
+++ projects/vnet/sys/netpfil/ipfw/dn_sched.h	Wed Jun  1 10:55:22 2016	(r301117)
@@ -196,6 +196,6 @@ int dn_sched_modevent(module_t mod, int 
 		#name, dn_sched_modevent, dnsched		\
 	};							\
 	DECLARE_MODULE(name, name##_mod, 			\
-		SI_SUB_FW, SI_ORDER_ANY); 			\
+		SI_SUB_PROTO_FIREWALL, SI_ORDER_ANY); 		\
         MODULE_DEPEND(name, dummynet, 3, 3, 3)
 #endif /* _DN_SCHED_H */

Modified: projects/vnet/sys/netpfil/ipfw/ip_dummynet.c
==============================================================================
--- projects/vnet/sys/netpfil/ipfw/ip_dummynet.c	Wed Jun  1 10:24:08 2016	(r301116)
+++ projects/vnet/sys/netpfil/ipfw/ip_dummynet.c	Wed Jun  1 10:55:22 2016	(r301117)
@@ -2629,7 +2629,7 @@ static moduledata_t dummynet_mod = {
 	"dummynet", dummynet_modevent, NULL
 };
 
-#define	DN_SI_SUB	SI_SUB_FW
+#define	DN_SI_SUB	SI_SUB_PROTO_FIREWALL
 #define	DN_MODEV_ORD	(SI_ORDER_ANY - 128) /* after ipfw */
 DECLARE_MODULE(dummynet, dummynet_mod, DN_SI_SUB, DN_MODEV_ORD);
 MODULE_DEPEND(dummynet, ipfw, 3, 3, 3);

Modified: projects/vnet/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- projects/vnet/sys/netpfil/ipfw/ip_fw2.c	Wed Jun  1 10:24:08 2016	(r301116)
+++ projects/vnet/sys/netpfil/ipfw/ip_fw2.c	Wed Jun  1 10:55:22 2016	(r301117)
@@ -2890,7 +2890,7 @@ static moduledata_t ipfwmod = {
 };
 
 /* Define startup order. */
-#define	IPFW_SI_SUB_FIREWALL	SI_SUB_FW
+#define	IPFW_SI_SUB_FIREWALL	SI_SUB_PROTO_FIREWALL
 #define	IPFW_MODEVENT_ORDER	(SI_ORDER_ANY - 255) /* On boot slot in here. */
 #define	IPFW_MODULE_ORDER	(IPFW_MODEVENT_ORDER + 1) /* A little later. */
 #define	IPFW_VNET_ORDER		(IPFW_MODEVENT_ORDER + 2) /* Later still. */

Modified: projects/vnet/sys/netpfil/ipfw/ip_fw_nat.c
==============================================================================
--- projects/vnet/sys/netpfil/ipfw/ip_fw_nat.c	Wed Jun  1 10:24:08 2016	(r301116)
+++ projects/vnet/sys/netpfil/ipfw/ip_fw_nat.c	Wed Jun  1 10:55:22 2016	(r301117)
@@ -1213,7 +1213,7 @@ static moduledata_t ipfw_nat_mod = {
 };
 
 /* Define startup order. */
-#define	IPFW_NAT_SI_SUB_FIREWALL	SI_SUB_FW
+#define	IPFW_NAT_SI_SUB_FIREWALL	SI_SUB_PROTO_FIREWALL
 #define	IPFW_NAT_MODEVENT_ORDER		(SI_ORDER_ANY - 128) /* after ipfw */
 #define	IPFW_NAT_MODULE_ORDER		(IPFW_NAT_MODEVENT_ORDER + 1)
 #define	IPFW_NAT_VNET_ORDER		(IPFW_NAT_MODEVENT_ORDER + 2)

Modified: projects/vnet/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- projects/vnet/sys/netpfil/pf/pf_ioctl.c	Wed Jun  1 10:24:08 2016	(r301116)
+++ projects/vnet/sys/netpfil/pf/pf_ioctl.c	Wed Jun  1 10:55:22 2016	(r301117)
@@ -3790,5 +3790,5 @@ static moduledata_t pf_mod = {
 	0
 };
 
-DECLARE_MODULE(pf, pf_mod, SI_SUB_FW, SI_ORDER_FIRST);
+DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_FIREWALL, SI_ORDER_FIRST);
 MODULE_VERSION(pf, PF_MODVER);