nfe busted on 7.0-BETA4

[Pyun YongHyeon]

On Mon, Dec 03, 2007 at 06:44:19PM -0800, Rudy wrote:
 > 
 > I just did a cvsup form 7.0-CURRENT (about 5 months old) to BETA4 and 
 > nfe doesn't work anymore (it had been working).
 > I recompiled the kernel with 'devide nve' to send out this email!  (nve 
 > = deprecated driver for nVidia
 > 
 > Motherboard: Asus M2NPV-VM
 > uname -a:
 > FreeBSD monchichi.monkeybrains.net 7.0-BETA4 FreeBSD 7.0-BETA4 #2: Mon 
 > Dec  3 16:46:44 PST 2007     
 > root at monchichi.monkeybrains.net:/usr/obj/usr/src/sys/MONCHICHI  i386
 > 
 > make.conf:
 > CFLAGS= -O2 -fno-strict-aliasing -pipe
 > COPTFLAGS= -O -pipe
 > CPUTYPE?=athlon64
 > 
 > 
 > 
 > 
 > Dec  4 00:30:35 monchichi kernel: nfe0: discard frame w/o leading 
 > ethernet header (len 10 pkt len 10)
 > Dec  4 00:30:37 monchichi kernel: nfe0: discard frame w/o leading 
 > ethernet header (len 0 pkt len 0)
 > Dec  4 00:30:37 monchichi kernel: nfe0: discard frame w/o leading 
 > ethernet header (len 10 pkt len 10)
 > Dec  4 00:30:39 monchichi kernel: nfe0: discard frame w/o leading 
 > ethernet header (len 0 pkt len 0)
 > Dec  4 00:30:39 monchichi kernel: nfe0: discard frame w/o leading 
 > ethernet header (len 10 pkt len 10)
 > Dec  4 00:30:41 monchichi kernel: nfe0: discard frame w/o leading 
 > ethernet header (len 0 pkt len 0)
 > Dec  4 00:30:41 monchichi kernel: nfe0: discard frame w/o leading 
 > ethernet header (len 10 pkt len 10)
 > Dec  4 00:30:43 monchichi kernel: nfe0: discard frame w/o leading 
 > ethernet header (len 0 pkt len 0)
 > Dec  4 00:30:43 monchichi kernel: nfe0: discard frame w/o leading 
 > ethernet header (len 10 pkt len 10)
 > 
 > 
 > Here is the nve in dmesg:
 > Dec  4 01:01:24 monchichi kernel: nve0: <NVIDIA nForce MCP13 Networking 
 > Adapter> port 0xc800-0xc807 mem 0xfe02b000-0xfe02bfff irq 22 at device 
 > 20.0 on pci0
 > 
 > 

Try attached patch.

-- 
Regards,
Pyun YongHyeon
-------------- next part --------------
Index: if_nfe.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/nfe/if_nfe.c,v
retrieving revision 1.24
diff -u -r1.24 if_nfe.c
--- if_nfe.c	22 Nov 2007 02:44:58 -0000	1.24
+++ if_nfe.c	4 Dec 2007 05:20:38 -0000
@@ -2931,8 +2931,7 @@
 
 	/* force MAC to wakeup */
 	val = NFE_READ(sc, NFE_PWR_STATE);
-	if ((val & NFE_PWR_WAKEUP) == 0)
-		NFE_WRITE(sc, NFE_PWR_STATE, val | NFE_PWR_WAKEUP);
+	NFE_WRITE(sc, NFE_PWR_STATE, val | NFE_PWR_WAKEUP);
 	DELAY(10);
 	val = NFE_READ(sc, NFE_PWR_STATE);
 	NFE_WRITE(sc, NFE_PWR_STATE, val | NFE_PWR_VALID);