diff options
Diffstat (limited to 'drivers/net/dnet.c')
-rw-r--r-- | drivers/net/dnet.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c index 234685213f1a..8b0f50bbf3e5 100644 --- a/drivers/net/dnet.c +++ b/drivers/net/dnet.c | |||
@@ -594,8 +594,6 @@ static netdev_tx_t dnet_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
594 | 594 | ||
595 | spin_unlock_irqrestore(&bp->lock, flags); | 595 | spin_unlock_irqrestore(&bp->lock, flags); |
596 | 596 | ||
597 | dev->trans_start = jiffies; | ||
598 | |||
599 | return NETDEV_TX_OK; | 597 | return NETDEV_TX_OK; |
600 | } | 598 | } |
601 | 599 | ||
@@ -918,7 +916,7 @@ static int __devinit dnet_probe(struct platform_device *pdev) | |||
918 | 916 | ||
919 | dev_info(&pdev->dev, "Dave DNET at 0x%p (0x%08x) irq %d %pM\n", | 917 | dev_info(&pdev->dev, "Dave DNET at 0x%p (0x%08x) irq %d %pM\n", |
920 | bp->regs, mem_base, dev->irq, dev->dev_addr); | 918 | bp->regs, mem_base, dev->irq, dev->dev_addr); |
921 | dev_info(&pdev->dev, "has %smdio, %sirq, %sgigabit, %sdma \n", | 919 | dev_info(&pdev->dev, "has %smdio, %sirq, %sgigabit, %sdma\n", |
922 | (bp->capabilities & DNET_HAS_MDIO) ? "" : "no ", | 920 | (bp->capabilities & DNET_HAS_MDIO) ? "" : "no ", |
923 | (bp->capabilities & DNET_HAS_IRQ) ? "" : "no ", | 921 | (bp->capabilities & DNET_HAS_IRQ) ? "" : "no ", |
924 | (bp->capabilities & DNET_HAS_GIGABIT) ? "" : "no ", | 922 | (bp->capabilities & DNET_HAS_GIGABIT) ? "" : "no ", |