diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/tg3.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 22eb7c8c1a25..1f0fd7643249 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -12361,9 +12361,10 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
12361 | unsigned long tg3reg_base, tg3reg_len; | 12361 | unsigned long tg3reg_base, tg3reg_len; |
12362 | struct net_device *dev; | 12362 | struct net_device *dev; |
12363 | struct tg3 *tp; | 12363 | struct tg3 *tp; |
12364 | int i, err, pm_cap; | 12364 | int err, pm_cap; |
12365 | char str[40]; | 12365 | char str[40]; |
12366 | u64 dma_mask, persist_dma_mask; | 12366 | u64 dma_mask, persist_dma_mask; |
12367 | DECLARE_MAC_BUF(mac); | ||
12367 | 12368 | ||
12368 | if (tg3_version_printed++ == 0) | 12369 | if (tg3_version_printed++ == 0) |
12369 | printk(KERN_INFO "%s", version); | 12370 | printk(KERN_INFO "%s", version); |
@@ -12642,7 +12643,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
12642 | goto err_out_apeunmap; | 12643 | goto err_out_apeunmap; |
12643 | } | 12644 | } |
12644 | 12645 | ||
12645 | printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %s Ethernet ", | 12646 | printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] " |
12647 | "(%s) %s Ethernet %s\n", | ||
12646 | dev->name, | 12648 | dev->name, |
12647 | tp->board_part_number, | 12649 | tp->board_part_number, |
12648 | tp->pci_chip_rev_id, | 12650 | tp->pci_chip_rev_id, |
@@ -12650,11 +12652,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
12650 | tg3_bus_string(tp, str), | 12652 | tg3_bus_string(tp, str), |
12651 | ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" : | 12653 | ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" : |
12652 | ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" : | 12654 | ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" : |
12653 | "10/100/1000Base-T"))); | 12655 | "10/100/1000Base-T")), |
12654 | 12656 | print_mac(mac, dev->dev_addr)); | |
12655 | for (i = 0; i < 6; i++) | ||
12656 | printk("%2.2x%c", dev->dev_addr[i], | ||
12657 | i == 5 ? '\n' : ':'); | ||
12658 | 12657 | ||
12659 | printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] " | 12658 | printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] " |
12660 | "MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n", | 12659 | "MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n", |