Index: if_igb.c
===================================================================
--- if_igb.c	(revision 238165)
+++ if_igb.c	(working copy)
@@ -277,6 +277,7 @@
 		    const char *, int *, int);
 static int	igb_set_flowcntl(SYSCTL_HANDLER_ARGS);
 static int	igb_sysctl_dmac(SYSCTL_HANDLER_ARGS);
+static int	igb_sysctl_eee(SYSCTL_HANDLER_ARGS);
 
 #ifdef DEVICE_POLLING
 static poll_handler_t igb_poll;
@@ -586,10 +587,11 @@
 		    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
 		    OID_AUTO, "dmac", CTLTYPE_INT|CTLFLAG_RW,
 		    adapter, 0, igb_sysctl_dmac, "I", "DMA Coalesce");
-		igb_set_sysctl_value(adapter, "eee_disabled",
-		    "enable Energy Efficient Ethernet",
-		    (int *)&adapter->hw.dev_spec._82575.eee_disable,
-		    TRUE);
+		SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
+		    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+		    OID_AUTO, "eee_disabled", CTLTYPE_INT|CTLFLAG_RW,
+		    adapter, 0, igb_sysctl_eee, "I",
+		    "Disable Energy Efficient Ethernet");
 		if (adapter->hw.phy.media_type == e1000_media_type_copper)
 			e1000_set_eee_i350(&adapter->hw);
 	}
@@ -5988,3 +5990,25 @@
 	igb_init(adapter);
 	return (error);
 }
+
+/*
+** Manage Energy Efficient Ethernet:
+** Control values:
+** 	0/1 - enabled/disabled
+*/
+static int
+igb_sysctl_eee(SYSCTL_HANDLER_ARGS)
+{
+	struct adapter *adapter = (struct adapter *) arg1;
+	int		error, value;
+	
+	value = adapter->hw.dev_spec._82575.eee_disable;
+	error = sysctl_handle_int(oidp, &value, 0, req);
+	if (error || req->newptr == NULL)
+		return (error);
+	IGB_CORE_LOCK(adapter);
+	adapter->hw.dev_spec._82575.eee_disable = (value != 0);
+	igb_init_locked(adapter);
+	IGB_CORE_UNLOCK(adapter);
+	return (0);
+}
Index: if_em.c
===================================================================
--- if_em.c	(revision 238165)
+++ if_em.c	(working copy)
@@ -289,6 +289,7 @@
 static void	em_set_sysctl_value(struct adapter *, const char *,
 		    const char *, int *, int);
 static int	em_set_flowcntl(SYSCTL_HANDLER_ARGS);
+static int	em_sysctl_eee(SYSCTL_HANDLER_ARGS);
 
 static __inline void em_rx_discard(struct rx_ring *, int);
 
@@ -636,10 +637,13 @@
 		    " due to SOL/IDER session.\n");
 
 	/* Sysctl for setting Energy Efficient Ethernet */
-	em_set_sysctl_value(adapter, "eee_control",
-	    "enable Energy Efficient Ethernet",
-	    (int *)&hw->dev_spec.ich8lan.eee_disable, eee_setting);
-
+	hw->dev_spec.ich8lan.eee_disable = eee_setting;
+	SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
+	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+	    OID_AUTO, "eee_control", CTLTYPE_INT|CTLFLAG_RW,
+	    adapter, 0, em_sysctl_eee, "I",
+	    "Disable Energy Efficient Ethernet");
+	
 	/*
 	** Start from a known state, this is
 	** important in reading the nvm and
@@ -5696,7 +5700,29 @@
 }
 
 
+/*
+** Manage Energy Efficient Ethernet:
+** Control values:
+** 	0/1 - enabled/disabled
+*/
 static int
+em_sysctl_eee(SYSCTL_HANDLER_ARGS)
+{
+	struct adapter *adapter = (struct adapter *) arg1;
+	int		error, value;
+	
+	value = adapter->hw.dev_spec.ich8lan.eee_disable;
+	error = sysctl_handle_int(oidp, &value, 0, req);
+	if (error || req->newptr == NULL)
+		return (error);
+	EM_CORE_LOCK(adapter);
+	adapter->hw.dev_spec.ich8lan.eee_disable = (value != 0);
+	em_init_locked(adapter);
+	EM_CORE_UNLOCK(adapter);
+	return (0);
+}
+
+static int
 em_sysctl_debug_info(SYSCTL_HANDLER_ARGS)
 {
 	struct adapter *adapter;