diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2010-01-12 10:11:36 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-13 17:18:52 -0800 |
| commit | 13fa95b0398d65885a79c6e95a09976ee9f8c009 (patch) | |
| tree | 85296ba31a76727f4fb6fa0040d023a6a5151dd0 /drivers/net/tg3.c | |
| parent | f3766c26a5d00189e5c0965c66f01956d15a92d6 (diff) | |
| download | kernel_samsung_smdk4412-13fa95b0398d65885a79c6e95a09976ee9f8c009.zip kernel_samsung_smdk4412-13fa95b0398d65885a79c6e95a09976ee9f8c009.tar.gz kernel_samsung_smdk4412-13fa95b0398d65885a79c6e95a09976ee9f8c009.tar.bz2 | |
tg3: Fix std prod ring nicaddr for 5787 and 57765
Commit 87668d352aa8d135bd695a050f18bbfc7b50b506, titled "tg3: Don't
touch RCB nic addresses", tried to avoid assigning the nic address of
the standard producer ring. Unfortunately, the default nic address is
not correct for the 5787, the 5755M, or the 57765. This patch
reenables the old behavior and opts out of the assignment only
for the 5717.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Tested-by: Chow Loong Jin <hyperair@ubuntu.com>
Tested-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 3a74d21..5c77e6a 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -7742,7 +7742,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) ((u64) tpr->rx_std_mapping >> 32)); tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW, ((u64) tpr->rx_std_mapping & 0xffffffff)); - if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS)) + if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717) tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR, NIC_SRAM_RX_BUFFER_DESC); |