From f678f57ec523049bb965d9883e829aaf282e231e Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Fri, 27 Jun 2008 13:30:56 +0000
Subject: [PATCH] Add flag to indicate that the NIC does not have power control
 capability. Model numbers from forcedeth.

---
 sys/dev/netif/nfe/if_nfe.c    | 13 ++++++++++---
 sys/dev/netif/nfe/if_nfevar.h |  5 +++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/sys/dev/netif/nfe/if_nfe.c b/sys/dev/netif/nfe/if_nfe.c
index 11d5c50476..7253a411c6 100644
--- a/sys/dev/netif/nfe/if_nfe.c
+++ b/sys/dev/netif/nfe/if_nfe.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_nfe.c,v 1.63 2006/06/17 18:00:43 brad Exp $	*/
-/*	$DragonFly: src/sys/dev/netif/nfe/if_nfe.c,v 1.24 2008/06/25 16:25:58 sephe Exp $	*/
+/*	$DragonFly: src/sys/dev/netif/nfe/if_nfe.c,v 1.25 2008/06/27 13:30:56 sephe Exp $	*/
 
 /*
  * Copyright (c) 2006 The DragonFly Project.  All rights reserved.
@@ -366,12 +366,18 @@ nfe_probe(device_t dev)
 			struct nfe_softc *sc = device_get_softc(dev);
 
 			switch (did) {
+			case PCI_PRODUCT_NVIDIA_NFORCE_LAN:
+			case PCI_PRODUCT_NVIDIA_NFORCE2_LAN:
+			case PCI_PRODUCT_NVIDIA_NFORCE3_LAN1:
+				sc->sc_flags = NFE_NO_PWRCTL;
+				break;
 			case PCI_PRODUCT_NVIDIA_NFORCE3_LAN2:
 			case PCI_PRODUCT_NVIDIA_NFORCE3_LAN3:
 			case PCI_PRODUCT_NVIDIA_NFORCE3_LAN4:
 			case PCI_PRODUCT_NVIDIA_NFORCE3_LAN5:
 				sc->sc_flags = NFE_JUMBO_SUP |
-					       NFE_HW_CSUM;
+					       NFE_HW_CSUM |
+					       NFE_NO_PWRCTL;
 				break;
 			case PCI_PRODUCT_NVIDIA_MCP51_LAN1:
 			case PCI_PRODUCT_NVIDIA_MCP51_LAN2:
@@ -395,7 +401,8 @@ nfe_probe(device_t dev)
 			case PCI_PRODUCT_NVIDIA_MCP04_LAN2:
 				sc->sc_flags = NFE_JUMBO_SUP |
 					       NFE_40BIT_ADDR |
-					       NFE_HW_CSUM;
+					       NFE_HW_CSUM |
+					       NFE_NO_PWRCTL;
 				break;
 			case PCI_PRODUCT_NVIDIA_MCP65_LAN1:
 			case PCI_PRODUCT_NVIDIA_MCP65_LAN2:
diff --git a/sys/dev/netif/nfe/if_nfevar.h b/sys/dev/netif/nfe/if_nfevar.h
index 5e1b148963..19d018c2cc 100644
--- a/sys/dev/netif/nfe/if_nfevar.h
+++ b/sys/dev/netif/nfe/if_nfevar.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_nfevar.h,v 1.11 2006/02/19 13:57:02 damien Exp $	*/
-/*	$DragonFly: src/sys/dev/netif/nfe/if_nfevar.h,v 1.3 2007/09/10 14:08:28 sephe Exp $	*/
+/*	$DragonFly: src/sys/dev/netif/nfe/if_nfevar.h,v 1.4 2008/06/27 13:30:56 sephe Exp $	*/
 
 /*
  * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
@@ -93,12 +93,13 @@ struct nfe_softc {
 	void			*sc_powerhook;
 
 	int			sc_if_flags;
-	u_int			sc_flags;
+	uint32_t		sc_flags;
 #define NFE_JUMBO_SUP	0x01
 #define NFE_40BIT_ADDR	0x02
 #define NFE_HW_CSUM	0x04
 #define NFE_HW_VLAN	0x08
 #define NFE_USE_JUMBO	0x10
+#define NFE_NO_PWRCTL	0x20
 
 	uint32_t		rxtxctl;
 	uint8_t			mii_phyaddr;
-- 
2.11.4.GIT