diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-01 22:53:36 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-01 22:53:36 -0400 |
| commit | b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732 (patch) | |
| tree | 194e13dfa85d2d2af8bd125acd80a445ee0def62 /drivers/net/3c507.c | |
| parent | fe955682d2153b35dffcf1673dff0491096a3f0a (diff) | |
| parent | 0a76a34ff0804f1f413807b2e2d12117c2b602ca (diff) | |
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
Diffstat (limited to 'drivers/net/3c507.c')
| -rw-r--r-- | drivers/net/3c507.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index b32b7a1710b..ea9b7a098c9 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c @@ -449,7 +449,6 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr) pr_debug("%s", version); lp = netdev_priv(dev); - memset(lp, 0, sizeof(*lp)); spin_lock_init(&lp->lock); lp->base = ioremap(dev->mem_start, RX_BUF_END); if (!lp->base) { @@ -505,7 +504,7 @@ static void el16_tx_timeout (struct net_device *dev) outb (0, ioaddr + SIGNAL_CA); /* Issue channel-attn. */ lp->last_restart = dev->stats.tx_packets; } - dev->trans_start = jiffies; + dev->trans_start = jiffies; /* prevent tx timeout */ netif_wake_queue (dev); } @@ -529,7 +528,6 @@ static netdev_tx_t el16_send_packet (struct sk_buff *skb, hardware_send_packet (dev, buf, skb->len, length - skb->len); - dev->trans_start = jiffies; /* Enable the 82586 interrupt input. */ outb (0x84, ioaddr + MISC_CTRL); @@ -553,8 +551,7 @@ static irqreturn_t el16_interrupt(int irq, void *dev_id) void __iomem *shmem; if (dev == NULL) { - pr_err("%s: net_interrupt(): irq %d for unknown device.\n", - dev->name, irq); + pr_err("net_interrupt(): irq %d for unknown device.\n", irq); return IRQ_NONE; } @@ -766,7 +763,6 @@ static void init_82586_mem(struct net_device *dev) if (net_debug > 4) pr_debug("%s: Initialized 82586, status %04x.\n", dev->name, readw(shmem+iSCB_STATUS)); - return; } static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad) |