Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 78561
b: refs/heads/master
c: d664537
h: refs/heads/master
i:
  78559: 98585fe
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Jan 28, 2008
1 parent fd59395 commit 36075be
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 137919a9ba10897b579618f19bfaa0b18c09c398
refs/heads/master: d66453722873e1595b7934acbdcd5cdfa6982d6c
13 changes: 6 additions & 7 deletions trunk/drivers/net/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -12361,9 +12361,10 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
unsigned long tg3reg_base, tg3reg_len;
struct net_device *dev;
struct tg3 *tp;
int i, err, pm_cap;
int err, pm_cap;
char str[40];
u64 dma_mask, persist_dma_mask;
DECLARE_MAC_BUF(mac);

if (tg3_version_printed++ == 0)
printk(KERN_INFO "%s", version);
Expand Down Expand Up @@ -12642,19 +12643,17 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
goto err_out_apeunmap;
}

printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %s Ethernet ",
printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] "
"(%s) %s Ethernet %s\n",
dev->name,
tp->board_part_number,
tp->pci_chip_rev_id,
tg3_phy_string(tp),
tg3_bus_string(tp, str),
((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" :
((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" :
"10/100/1000Base-T")));

for (i = 0; i < 6; i++)
printk("%2.2x%c", dev->dev_addr[i],
i == 5 ? '\n' : ':');
"10/100/1000Base-T")),
print_mac(mac, dev->dev_addr));

printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] "
"MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n",
Expand Down

0 comments on commit 36075be

Please sign in to comment.