svn commit: r366651 - in stable/12/sys: contrib/ipfilter/netinet x86/bios

[Ryan Moeller]

Author: freqlabs
Date: Mon Oct 12 17:43:38 2020
New Revision: 366651
URL: https://svnweb.freebsd.org/changeset/base/366651

Log:
  MFC r366433
  
  Explicit CTLFLAG_DYN not needed
  
  Dynamically created OIDs automatically get this flag set.
  
  Reviewed by:	jhb
  Sponsored by:	iXsystems, Inc.
  Differential Revision:	https://reviews.freebsd.org/D26561

Modified:
  stable/12/sys/contrib/ipfilter/netinet/mlfk_ipl.c
  stable/12/sys/x86/bios/vpd.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/contrib/ipfilter/netinet/mlfk_ipl.c
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/mlfk_ipl.c	Mon Oct 12 16:45:07 2020	(r366650)
+++ stable/12/sys/contrib/ipfilter/netinet/mlfk_ipl.c	Mon Oct 12 17:43:38 2020	(r366651)
@@ -87,16 +87,16 @@ SYSCTL_DECL(_net_inet);
 		   ptr, val, sysctl_ipf_int, "I", descr)
 #define SYSCTL_DYN_IPF_NAT(parent, nbr, name, access,ptr, val, descr) \
 	SYSCTL_ADD_OID(&ipf_clist, SYSCTL_STATIC_CHILDREN(parent), nbr, name, \
-	CTLFLAG_DYN|CTLTYPE_INT|CTLFLAG_VNET|access, ptr, val, sysctl_ipf_int_nat, "I", descr)
+	CTLTYPE_INT|CTLFLAG_VNET|access, ptr, val, sysctl_ipf_int_nat, "I", descr)
 #define SYSCTL_DYN_IPF_STATE(parent, nbr, name, access,ptr, val, descr) \
 	SYSCTL_ADD_OID(&ipf_clist, SYSCTL_STATIC_CHILDREN(parent), nbr, name, \
-	CTLFLAG_DYN|CTLTYPE_INT|CTLFLAG_VNET|access, ptr, val, sysctl_ipf_int_state, "I", descr)
+	CTLTYPE_INT|CTLFLAG_VNET|access, ptr, val, sysctl_ipf_int_state, "I", descr)
 #define SYSCTL_DYN_IPF_FRAG(parent, nbr, name, access,ptr, val, descr) \
 	SYSCTL_ADD_OID(&ipf_clist, SYSCTL_STATIC_CHILDREN(parent), nbr, name, \
-	CTLFLAG_DYN|CTLTYPE_INT|CTLFLAG_VNET|access, ptr, val, sysctl_ipf_int_frag, "I", descr)
+	CTLTYPE_INT|CTLFLAG_VNET|access, ptr, val, sysctl_ipf_int_frag, "I", descr)
 #define SYSCTL_DYN_IPF_AUTH(parent, nbr, name, access,ptr, val, descr) \
 	SYSCTL_ADD_OID(&ipf_clist, SYSCTL_STATIC_CHILDREN(parent), nbr, name, \
-	CTLFLAG_DYN|CTLTYPE_INT|CTLFLAG_VNET|access, ptr, val, sysctl_ipf_int_auth, "I", descr)
+	CTLTYPE_INT|CTLFLAG_VNET|access, ptr, val, sysctl_ipf_int_auth, "I", descr)
 static struct sysctl_ctx_list ipf_clist;
 #define	CTLFLAG_OFF	0x00800000	/* IPFilter must be disabled */
 #define	CTLFLAG_RWO	(CTLFLAG_RW|CTLFLAG_OFF)

Modified: stable/12/sys/x86/bios/vpd.c
==============================================================================
--- stable/12/sys/x86/bios/vpd.c	Mon Oct 12 16:45:07 2020	(r366650)
+++ stable/12/sys/x86/bios/vpd.c	Mon Oct 12 17:43:38 2020	(r366651)
@@ -195,19 +195,19 @@ vpd_attach (device_t dev)
 	sysctl_ctx_init(&sc->ctx);
 	SYSCTL_ADD_STRING(&sc->ctx,
 		SYSCTL_STATIC_CHILDREN(_hw_vpd_machine_type), OID_AUTO,
-		unit, CTLFLAG_RD|CTLFLAG_DYN, sc->MachineType, 0, NULL);
+		unit, CTLFLAG_RD, sc->MachineType, 0, NULL);
 	SYSCTL_ADD_STRING(&sc->ctx,
 		SYSCTL_STATIC_CHILDREN(_hw_vpd_machine_model), OID_AUTO,
-		unit, CTLFLAG_RD|CTLFLAG_DYN, sc->MachineModel, 0, NULL);
+		unit, CTLFLAG_RD, sc->MachineModel, 0, NULL);
 	SYSCTL_ADD_STRING(&sc->ctx,
 		SYSCTL_STATIC_CHILDREN(_hw_vpd_build_id), OID_AUTO,
-		unit, CTLFLAG_RD|CTLFLAG_DYN, sc->BuildID, 0, NULL);
+		unit, CTLFLAG_RD, sc->BuildID, 0, NULL);
 	SYSCTL_ADD_STRING(&sc->ctx,
 		SYSCTL_STATIC_CHILDREN(_hw_vpd_serial_box), OID_AUTO,
-		unit, CTLFLAG_RD|CTLFLAG_DYN, sc->BoxSerial, 0, NULL);
+		unit, CTLFLAG_RD, sc->BoxSerial, 0, NULL);
 	SYSCTL_ADD_STRING(&sc->ctx,
 		SYSCTL_STATIC_CHILDREN(_hw_vpd_serial_planar), OID_AUTO,
-		unit, CTLFLAG_RD|CTLFLAG_DYN, sc->PlanarSerial, 0, NULL);
+		unit, CTLFLAG_RD, sc->PlanarSerial, 0, NULL);
 
 	device_printf(dev, "Machine Type: %.4s, Model: %.3s, Build ID: %.9s\n",
 		sc->MachineType, sc->MachineModel, sc->BuildID);