File tree Expand file tree Collapse file tree 1 file changed +6
-7
lines changed Expand file tree Collapse file tree 1 file changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -12361,9 +12361,10 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
12361
12361
unsigned long tg3reg_base , tg3reg_len ;
12362
12362
struct net_device * dev ;
12363
12363
struct tg3 * tp ;
12364
- int i , err , pm_cap ;
12364
+ int err , pm_cap ;
12365
12365
char str [40 ];
12366
12366
u64 dma_mask , persist_dma_mask ;
12367
+ DECLARE_MAC_BUF (mac );
12367
12368
12368
12369
if (tg3_version_printed ++ == 0 )
12369
12370
printk (KERN_INFO "%s" , version );
@@ -12642,19 +12643,17 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
12642
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
12648
dev -> name ,
12647
12649
tp -> board_part_number ,
12648
12650
tp -> pci_chip_rev_id ,
12649
12651
tg3_phy_string (tp ),
12650
12652
tg3_bus_string (tp , str ),
12651
12653
((tp -> tg3_flags & TG3_FLAG_10_100_ONLY ) ? "10/100Base-TX" :
12652
12654
((tp -> tg3_flags2 & TG3_FLG2_ANY_SERDES ) ? "1000Base-SX" :
12653
- "10/100/1000Base-T" )));
12654
-
12655
- for (i = 0 ; i < 6 ; i ++ )
12656
- printk ("%2.2x%c" , dev -> dev_addr [i ],
12657
- i == 5 ? '\n' : ':' );
12655
+ "10/100/1000Base-T" )),
12656
+ print_mac (mac , dev -> dev_addr ));
12658
12657
12659
12658
printk (KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] "
12660
12659
"MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n" ,
You can’t perform that action at this time.
0 commit comments