Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236695
b: refs/heads/master
c: 4d163b7
h: refs/heads/master
i:
  236693: 8d69495
  236691: 81a5f14
  236687: b92cf87
v: v3
  • Loading branch information
Matt Carlson authored and David S. Miller committed Jan 26, 2011
1 parent d86c538 commit f53d920
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 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: b4495ed88b782febddfa5bb99c87d75724520ecf
refs/heads/master: 4d163b75e979833979cc401ae433cb1d7743d57e
12 changes: 8 additions & 4 deletions trunk/drivers/net/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -8108,8 +8108,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
/* Program the jumbo buffer descriptor ring control
* blocks on those devices that have them.
*/
if ((tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) &&
!(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0 ||
((tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) &&
!(tp->tg3_flags2 & TG3_FLG2_5780_CLASS))) {
/* Setup replenish threshold. */
tw32(RCVBDI_JUMBO_THRESH, tp->rx_jumbo_pending / 8);

Expand Down Expand Up @@ -13329,7 +13330,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
}

/* Determine TSO capabilities */
if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0)
; /* Do nothing. HW bug. */
else if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
tp->tg3_flags2 |= TG3_FLG2_HW_TSO_3;
else if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
Expand Down Expand Up @@ -13380,7 +13383,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
tp->tg3_flags3 |= TG3_FLG3_40BIT_DMA_LIMIT_BUG;
}

if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
if ((tp->tg3_flags3 & TG3_FLG3_5717_PLUS) &&
tp->pci_chip_rev_id != CHIPREV_ID_5719_A0)
tp->tg3_flags3 |= TG3_FLG3_USE_JUMBO_BDFLAG;

if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/tg3.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
#define CHIPREV_ID_57780_A1 0x57780001
#define CHIPREV_ID_5717_A0 0x05717000
#define CHIPREV_ID_57765_A0 0x57785000
#define CHIPREV_ID_5719_A0 0x05719000
#define GET_ASIC_REV(CHIP_REV_ID) ((CHIP_REV_ID) >> 12)
#define ASIC_REV_5700 0x07
#define ASIC_REV_5701 0x00
Expand Down

0 comments on commit f53d920

Please sign in to comment.