diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index 5e7ba9734f20..565b42e4f4a5 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.173 2009/04/07 18:23:37 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.174 2009/04/07 18:42:30 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -73,13 +73,10 @@
  * TODO (in order of importance):
  *
  *	- Rework how parameters are loaded from the EEPROM.
- *	- Figure out what to do with the i82545GM and i82546GB
- *	  SERDES controllers.
- *	- Fix hw VLAN assist.
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.173 2009/04/07 18:23:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.174 2009/04/07 18:42:30 msaitoh Exp $");
 
 #include "bpfilter.h"
 #include "rnd.h"
@@ -886,6 +883,9 @@ static const struct wm_product {
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82567LF_3,
 	  "82567LF-3 LAN Controller",
 	  WM_T_ICH10,		WMP_F_1000T },
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82801J_D_BM_LF,
+	  "i82801J (LF) LAN Controller",
+	  WM_T_ICH10,		WMP_F_1000T },
 	{ 0,			0,
 	  NULL,
 	  0,			0 },
@@ -3077,6 +3077,9 @@ wm_reset(struct wm_softc *sc)
 		wm_get_auto_rd_done(sc);
 	}
 
+	/* reload sc_ctrl */
+	sc->sc_ctrl = CSR_READ(sc, WMREG_CTRL);
+
 #if 0
 	for (i = 0; i < 1000; i++) {
 		if ((CSR_READ(sc, WMREG_CTRL) & CTRL_RST) == 0) {