Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 183703
b: refs/heads/master
c: 8b5a6c4
h: refs/heads/master
i:
  183701: bf5b09f
  183699: b632860
  183695: 3a2d654
v: v3
  • Loading branch information
Matt Carlson authored and David S. Miller committed Jan 21, 2010
1 parent ff5489b commit 5cad756
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ecf1410b9d70b3034e5955e92bb0c3e02ff21e9c
refs/heads/master: 8b5a6c42e1f2277433aeefa9ee5a0c1a2473b7d8
17 changes: 16 additions & 1 deletion trunk/drivers/net/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -10659,12 +10659,27 @@ static int tg3_test_memory(struct tg3 *tp)
{ 0x00008000, 0x01000},
{ 0x00010000, 0x01000},
{ 0xffffffff, 0x00000}
}, mem_tbl_5717[] = {
{ 0x00000200, 0x00008},
{ 0x00010000, 0x0a000},
{ 0x00020000, 0x13c00},
{ 0xffffffff, 0x00000}
}, mem_tbl_57765[] = {
{ 0x00000200, 0x00008},
{ 0x00004000, 0x00800},
{ 0x00006000, 0x09800},
{ 0x00010000, 0x0a000},
{ 0xffffffff, 0x00000}
};
struct mem_entry *mem_tbl;
int err = 0;
int i;

if (tp->tg3_flags3 & TG3_FLG3_5755_PLUS)
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
mem_tbl = mem_tbl_5717;
else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
mem_tbl = mem_tbl_57765;
else if (tp->tg3_flags3 & TG3_FLG3_5755_PLUS)
mem_tbl = mem_tbl_5755;
else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
mem_tbl = mem_tbl_5906;
Expand Down

0 comments on commit 5cad756

Please sign in to comment.