diff options
| author | akw27@boulderdash.cl.cam.ac.uk <akw27@boulderdash.cl.cam.ac.uk> | 2003-02-14 13:15:39 +0000 |
|---|---|---|
| committer | akw27@boulderdash.cl.cam.ac.uk <akw27@boulderdash.cl.cam.ac.uk> | 2003-02-14 13:15:39 +0000 |
| commit | 26ebb5b27fe8a6773fe3660bd2ce84823637a3f9 (patch) | |
| tree | 14113f1a684669cafe41319a6402d5bfcb9cf414 /xen-2.4.16/drivers | |
| parent | 073fcb53a75974c853658d897406b42c7ff4f97f (diff) | |
| download | xen-26ebb5b27fe8a6773fe3660bd2ce84823637a3f9.tar.gz xen-26ebb5b27fe8a6773fe3660bd2ce84823637a3f9.tar.bz2 xen-26ebb5b27fe8a6773fe3660bd2ce84823637a3f9.zip | |
bitkeeper revision 1.22.1.13 (3e4cebfb6eonEmBxQR609x0DlVAf5Q)
updates to enable inter-domain communication. (this requires that the vif's be
mapped appropriately by dom0) but now works correctly. Secondly, guest now
dev_alloc_skbs the original way.
Diffstat (limited to 'xen-2.4.16/drivers')
| -rw-r--r-- | xen-2.4.16/drivers/net/tg3.c | 22 | ||||
| -rw-r--r-- | xen-2.4.16/drivers/net/tg3.h | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/xen-2.4.16/drivers/net/tg3.c b/xen-2.4.16/drivers/net/tg3.c index 060154fa2b..41f680904b 100644 --- a/xen-2.4.16/drivers/net/tg3.c +++ b/xen-2.4.16/drivers/net/tg3.c @@ -4114,14 +4114,16 @@ static int tg3_reset_hw(struct tg3 *tp) udelay(10); } - tw32(HOSTCC_RXCOL_TICKS, 0); - tw32(HOSTCC_RXMAX_FRAMES, 1); - tw32(HOSTCC_RXCOAL_TICK_INT, 0); - tw32(HOSTCC_RXCOAL_MAXF_INT, 1); - tw32(HOSTCC_TXCOL_TICKS, LOW_TXCOL_TICKS); - tw32(HOSTCC_TXMAX_FRAMES, LOW_RXMAX_FRAMES); - tw32(HOSTCC_TXCOAL_TICK_INT, 0); - tw32(HOSTCC_TXCOAL_MAXF_INT, 0); + // akw: I have set these all back to default coalescing values. + + tw32(HOSTCC_RXCOL_TICKS, DEFAULT_RXCOL_TICKS); //0); + tw32(HOSTCC_RXMAX_FRAMES, DEFAULT_RXMAX_FRAMES); //1); + tw32(HOSTCC_RXCOAL_TICK_INT, DEFAULT_RXCOAL_TICK_INT); //, 0); + tw32(HOSTCC_RXCOAL_MAXF_INT, DEFAULT_RXCOAL_MAXF_INT); //, 1); + tw32(HOSTCC_TXCOL_TICKS, DEFAULT_TXCOL_TICKS); //, LOW_TXCOL_TICKS); + tw32(HOSTCC_TXMAX_FRAMES, DEFAULT_TXMAX_FRAMES); //, LOW_RXMAX_FRAMES); + tw32(HOSTCC_TXCOAL_TICK_INT, DEFAULT_TXCOAL_TICK_INT); //, 0); + tw32(HOSTCC_TXCOAL_MAXF_INT, DEFAULT_TXCOAL_MAXF_INT); //, 0); tw32(HOSTCC_STAT_COAL_TICKS, DEFAULT_STAT_COAL_TICKS); @@ -6185,9 +6187,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) } tp->rx_offset = 2; + if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 && (tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0) - tp->rx_offset = 0; + printk("WARNING: This card may not support unaligned receive pointers.\n"); + //tp->rx_offset = 0; /* By default, disable wake-on-lan. User can change this * using ETHTOOL_SWOL. diff --git a/xen-2.4.16/drivers/net/tg3.h b/xen-2.4.16/drivers/net/tg3.h index 349687c3fa..d816322d98 100644 --- a/xen-2.4.16/drivers/net/tg3.h +++ b/xen-2.4.16/drivers/net/tg3.h @@ -21,7 +21,7 @@ #define TG3_BDINFO_NIC_ADDR 0xcUL /* 32-bit */ #define TG3_BDINFO_SIZE 0x10UL -#define RX_COPY_THRESHOLD 256 +#define RX_COPY_THRESHOLD 0 //256 #define RX_STD_MAX_SIZE 1536 #define RX_JUMBO_MAX_SIZE 0xdeadbeef /* XXX */ |