diff options
Diffstat (limited to 'drivers/net/dl2k.c')
| -rw-r--r-- | drivers/net/dl2k.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index 895d72143ee0..4b6a219fecea 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
| @@ -268,8 +268,9 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 268 | printk(KERN_INFO "tx_coalesce:\t%d packets\n", | 268 | printk(KERN_INFO "tx_coalesce:\t%d packets\n", |
| 269 | tx_coalesce); | 269 | tx_coalesce); |
| 270 | if (np->coalesce) | 270 | if (np->coalesce) |
| 271 | printk(KERN_INFO "rx_coalesce:\t%d packets\n" | 271 | printk(KERN_INFO |
| 272 | KERN_INFO "rx_timeout: \t%d ns\n", | 272 | "rx_coalesce:\t%d packets\n" |
| 273 | "rx_timeout: \t%d ns\n", | ||
| 273 | np->rx_coalesce, np->rx_timeout*640); | 274 | np->rx_coalesce, np->rx_timeout*640); |
| 274 | if (np->vlan) | 275 | if (np->vlan) |
| 275 | printk(KERN_INFO "vlan(id):\t%d\n", np->vlan); | 276 | printk(KERN_INFO "vlan(id):\t%d\n", np->vlan); |
| @@ -1522,9 +1523,9 @@ mii_get_media (struct net_device *dev) | |||
| 1522 | printk (KERN_INFO "Operating at 10 Mbps, "); | 1523 | printk (KERN_INFO "Operating at 10 Mbps, "); |
| 1523 | } | 1524 | } |
| 1524 | if (bmcr & MII_BMCR_DUPLEX_MODE) { | 1525 | if (bmcr & MII_BMCR_DUPLEX_MODE) { |
| 1525 | printk ("Full duplex\n"); | 1526 | printk (KERN_CONT "Full duplex\n"); |
| 1526 | } else { | 1527 | } else { |
| 1527 | printk ("Half duplex\n"); | 1528 | printk (KERN_CONT "Half duplex\n"); |
| 1528 | } | 1529 | } |
| 1529 | } | 1530 | } |
| 1530 | if (np->tx_flow) | 1531 | if (np->tx_flow) |
| @@ -1614,9 +1615,9 @@ mii_set_media (struct net_device *dev) | |||
| 1614 | } | 1615 | } |
| 1615 | if (np->full_duplex) { | 1616 | if (np->full_duplex) { |
| 1616 | bmcr |= MII_BMCR_DUPLEX_MODE; | 1617 | bmcr |= MII_BMCR_DUPLEX_MODE; |
| 1617 | printk ("Full duplex\n"); | 1618 | printk (KERN_CONT "Full duplex\n"); |
| 1618 | } else { | 1619 | } else { |
| 1619 | printk ("Half duplex\n"); | 1620 | printk (KERN_CONT "Half duplex\n"); |
| 1620 | } | 1621 | } |
| 1621 | #if 0 | 1622 | #if 0 |
| 1622 | /* Set 1000BaseT Master/Slave setting */ | 1623 | /* Set 1000BaseT Master/Slave setting */ |
| @@ -1669,9 +1670,9 @@ mii_get_media_pcs (struct net_device *dev) | |||
| 1669 | __u16 bmcr = mii_read (dev, phy_addr, PCS_BMCR); | 1670 | __u16 bmcr = mii_read (dev, phy_addr, PCS_BMCR); |
| 1670 | printk (KERN_INFO "Operating at 1000 Mbps, "); | 1671 | printk (KERN_INFO "Operating at 1000 Mbps, "); |
| 1671 | if (bmcr & MII_BMCR_DUPLEX_MODE) { | 1672 | if (bmcr & MII_BMCR_DUPLEX_MODE) { |
| 1672 | printk ("Full duplex\n"); | 1673 | printk (KERN_CONT "Full duplex\n"); |
| 1673 | } else { | 1674 | } else { |
| 1674 | printk ("Half duplex\n"); | 1675 | printk (KERN_CONT "Half duplex\n"); |
| 1675 | } | 1676 | } |
| 1676 | } | 1677 | } |
| 1677 | if (np->tx_flow) | 1678 | if (np->tx_flow) |