From fa0bbee0002d34d1407e98d29120e03c3b815e50 Mon Sep 17 00:00:00 2001 From: Jay Cliburn Date: Thu, 19 Jul 2007 18:45:12 -0500 Subject: [PATCH] --- yaml --- r: 62816 b: refs/heads/master c: 91a500ac5654766e4d9a6502dfcceb7e0a235f98 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/atl1/atl1_main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2686885b3482..b8846db8ae42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f516c00d416bd39aab6cfb348b68919e295fe23 +refs/heads/master: 91a500ac5654766e4d9a6502dfcceb7e0a235f98 diff --git a/trunk/drivers/net/atl1/atl1_main.c b/trunk/drivers/net/atl1/atl1_main.c index 3b8f633ec05e..6aa2dc32727e 100644 --- a/trunk/drivers/net/atl1/atl1_main.c +++ b/trunk/drivers/net/atl1/atl1_main.c @@ -917,7 +917,10 @@ static u32 atl1_configure(struct atl1_adapter *adapter) iowrite32(value, hw->hw_addr + REG_DMA_CTRL); /* config CMB / SMB */ - value = hw->cmb_rrd | ((u32) hw->cmb_tpd << 16); + value = (hw->cmb_tpd > adapter->tpd_ring.count) ? + hw->cmb_tpd : adapter->tpd_ring.count; + value <<= 16; + value |= hw->cmb_rrd; iowrite32(value, hw->hw_addr + REG_CMB_WRITE_TH); value = hw->cmb_rx_timer | ((u32) hw->cmb_tx_timer << 16); iowrite32(value, hw->hw_addr + REG_CMB_WRITE_TIMER);