Module Name: src
Committed By: jdc
Date: Fri Dec 4 13:35:56 UTC 2009
Modified Files:
src/sys/dev/ic: gem.c
Log Message:
Only set 0x4FF in the transmit register for gigabit variants. Set 0x100
otherwise.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/ic/gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/gem.c
diff -u src/sys/dev/ic/gem.c:1.86 src/sys/dev/ic/gem.c:1.87
--- src/sys/dev/ic/gem.c:1.86 Fri Dec 4 11:55:01 2009
+++ src/sys/dev/ic/gem.c Fri Dec 4 13:35:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.86 2009/12/04 11:55:01 martin Exp $ */
+/* $NetBSD: gem.c,v 1.87 2009/12/04 13:35:56 jdc Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.86 2009/12/04 11:55:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.87 2009/12/04 13:35:56 jdc Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -1161,8 +1161,9 @@
/* Enable TX DMA */
v = gem_ringsize(GEM_NTXDESC /*XXX*/);
bus_space_write_4(t, h, GEM_TX_CONFIG,
- v|GEM_TX_CONFIG_TXDMA_EN|
- ((0x4FF<<10)&GEM_TX_CONFIG_TXFIFO_TH));
+ v | GEM_TX_CONFIG_TXDMA_EN |
+ (((sc->sc_flags & GEM_GIGABIT ? 0x4FF : 0x100) << 10) &
+ GEM_TX_CONFIG_TXFIFO_TH));
bus_space_write_4(t, h, GEM_TX_KICK, sc->sc_txnext);
/* step 10. ERX Configuration */
