svn commit: r263680 - stable/10/sys/netpfil/ipfw

[Gleb Smirnoff]

Author: glebius
Date: Mon Mar 24 10:19:07 2014
New Revision: 263680
URL: http://svnweb.freebsd.org/changeset/base/263680

Log:
  Merge r263497: fix ipfw + VIMAGE sysctls.
  
  PR:		kern/187665

Modified:
  stable/10/sys/netpfil/ipfw/ip_fw_pfil.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netpfil/ipfw/ip_fw_pfil.c
==============================================================================
--- stable/10/sys/netpfil/ipfw/ip_fw_pfil.c	Mon Mar 24 08:24:32 2014	(r263679)
+++ stable/10/sys/netpfil/ipfw/ip_fw_pfil.c	Mon Mar 24 10:19:07 2014	(r263680)
@@ -536,30 +536,22 @@ ipfw_attach_hooks(int arg)
 int
 ipfw_chg_hook(SYSCTL_HANDLER_ARGS)
 {
-	int *enable;
 	int newval;
 	int error;
 	int af;
 
-	if (arg1 == &VNET_NAME(fw_enable)) {
-		enable = &V_fw_enable;
+	if (arg1 == &V_fw_enable)
 		af = AF_INET;
-	}
 #ifdef INET6
-	else if (arg1 == &VNET_NAME(fw6_enable)) {
-		enable = &V_fw6_enable;
+	else if (arg1 == &V_fw6_enable)
 		af = AF_INET6;
-	}
 #endif
-	else if (arg1 == &VNET_NAME(fwlink_enable)) {
-		enable = &V_fwlink_enable;
+	else if (arg1 == &V_fwlink_enable)
 		af = AF_LINK;
-	}
 	else 
 		return (EINVAL);
 
-	newval = *enable;
-
+	newval = *(int *)arg1;
 	/* Handle sysctl change */
 	error = sysctl_handle_int(oidp, &newval, 0, req);
 
@@ -569,13 +561,13 @@ ipfw_chg_hook(SYSCTL_HANDLER_ARGS)
 	/* Formalize new value */
 	newval = (newval) ? 1 : 0;
 
-	if (*enable == newval)
+	if (*(int *)arg1 == newval)
 		return (0);
 
 	error = ipfw_hook(newval, af);
 	if (error)
 		return (error);
-	*enable = newval;
+	*(int *)arg1 = newval;
 
 	return (0);
 }