aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2009-08-25 06:07:54 -0400
committerDavid S. Miller <davem@davemloft.net>2009-08-26 18:47:51 -0400
commit29ea095fb727ac48228ff2d1af484c27bf1dcbd4 (patch)
tree340b7879e0d2e3b76492265ddef978f242675fb1
parent255ca311b650caece3ec4f78b88ef298664d561f (diff)
tg3: Fix TSO test against wrong flags var
Julia Lawall discovered that the TG3_FLG2_TSO_CAPABLE flag was being compared against the wrong flags device member. This patch implements the fix. Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tg3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 595ddf2eb7d2..ca3052d5c409 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7192,7 +7192,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
7192 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 && 7192 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
7193 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) || 7193 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
7194 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) { 7194 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
7195 if ((tp->tg3_flags & TG3_FLG2_TSO_CAPABLE) && 7195 if ((tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) &&
7196 (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 || 7196 (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
7197 tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) { 7197 tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
7198 /* nothing */ 7198 /* nothing */