tree f7d34015aaccfe11e667c36c8055ebe28cf93301
parent bb7064dc09ff90015ddc7d818dd8fefb8ca5b936
author John W. Linville <[EMAIL PROTECTED]> Fri, 22 Apr 2005 07:03:18 -0700
committer David S. Miller <[EMAIL PROTECTED]> Fri, 22 Apr 2005 07:03:18 -0700
[TG3]: check TG3_FLG2_5750_PLUS flag to set TG3_FLG2_5705_PLUS flag
Use check of TG3_FLG2_5750_PLUS in tg3_get_invariants to set
TG3_FLG2_5705_PLUS flag.
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
net/tg3.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
Index: drivers/net/tg3.c
===================================================================
--- 683f6e32186ea6e62dcb1647b05ab3ceb0d8de6c/drivers/net/tg3.c (mode:100644
sha1:f47b30569192e0c7de02946b50cfdd05886d0f9c)
+++ f7d34015aaccfe11e667c36c8055ebe28cf93301/drivers/net/tg3.c (mode:100644
sha1:0951a9605577ec0d069a1630106ea84a49e80d4a)
@@ -7928,15 +7928,14 @@ static int __devinit tg3_get_invariants(
tp->pci_hdr_type = (cacheline_sz_reg >> 16) & 0xff;
tp->pci_bist = (cacheline_sz_reg >> 24) & 0xff;
- if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) ||
- (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) ||
- (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752))
- tp->tg3_flags2 |= TG3_FLG2_5705_PLUS;
-
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
tp->tg3_flags2 |= TG3_FLG2_5750_PLUS;
+ if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) ||
+ (tp->tg3_flags2 & TG3_FLG2_5750_PLUS))
+ tp->tg3_flags2 |= TG3_FLG2_5705_PLUS;
+
if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
tp->tg3_flags2 |= TG3_FLG2_HW_TSO;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
