diff --git a/[refs] b/[refs] index c201eb37b867..dc4ffa35ae87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f89f38b8ec3171664314669a1396ab70b43e8961 +refs/heads/master: 6b10c1653e425e30cff7f41d0e6f9743bfa9810f diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index c140e1bf6e02..2c5e1b7e1088 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -6721,6 +6721,13 @@ static int tg3_poll_fw(struct tg3 *tp) tp->dev->name); } + if (tp->pci_chip_rev_id == CHIPREV_ID_57765_A0) { + /* The 57765 A0 needs a little more + * time to do some important work. + */ + mdelay(10); + } + return 0; } diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h index cc8bf7d6823a..46db4ad46bbc 100644 --- a/trunk/drivers/net/tg3.h +++ b/trunk/drivers/net/tg3.h @@ -110,6 +110,7 @@ #define CHIPREV_ID_57780_A0 0x57780000 #define CHIPREV_ID_57780_A1 0x57780001 #define CHIPREV_ID_5717_A0 0x05717000 +#define CHIPREV_ID_57765_A0 0x57785000 #define GET_ASIC_REV(CHIP_REV_ID) ((CHIP_REV_ID) >> 12) #define ASIC_REV_5700 0x07 #define ASIC_REV_5701 0x00