git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
can: Fix SJA1000 command register writes on SMP systems
[safe/jmp/linux-2.6]
/
drivers
/
net
/
sunhme.c
diff --git
a/drivers/net/sunhme.c
b/drivers/net/sunhme.c
index
20deb14
..
915c590
100644
(file)
--- a/
drivers/net/sunhme.c
+++ b/
drivers/net/sunhme.c
@@
-855,7
+855,7
@@
static void happy_meal_timer(unsigned long data)
hp->timer_ticks = 0;
hp->timer_state = asleep; /* foo on you */
break;
hp->timer_ticks = 0;
hp->timer_state = asleep; /* foo on you */
break;
- }
;
+ }
if (restart_timer) {
hp->happy_timer.expires = jiffies + ((12 * HZ)/10); /* 1.2 sec. */
if (restart_timer) {
hp->happy_timer.expires = jiffies + ((12 * HZ)/10); /* 1.2 sec. */
@@
-1488,7
+1488,7
@@
static int happy_meal_init(struct happy_meal *hp)
HMD(("external, disable MII, "));
hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB);
break;
HMD(("external, disable MII, "));
hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB);
break;
- }
;
+ }
if (happy_meal_tcvr_reset(hp, tregs))
return -EAGAIN;
if (happy_meal_tcvr_reset(hp, tregs))
return -EAGAIN;
@@
-1734,7
+1734,7
@@
static void happy_meal_set_initial_advertisement(struct happy_meal *hp)
case external:
hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB);
break;
case external:
hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB);
break;
- }
;
+ }
if (happy_meal_tcvr_reset(hp, tregs))
return;
if (happy_meal_tcvr_reset(hp, tregs))
return;
@@
-2341,8
+2341,6
@@
static netdev_tx_t happy_meal_start_xmit(struct sk_buff *skb,
spin_unlock_irq(&hp->happy_lock);
spin_unlock_irq(&hp->happy_lock);
- dev->trans_start = jiffies;
-
tx_add_log(hp, TXLOG_ACTION_TXMIT, 0);
return NETDEV_TX_OK;
}
tx_add_log(hp, TXLOG_ACTION_TXMIT, 0);
return NETDEV_TX_OK;
}
@@
-2945,7
+2943,6
@@
static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr)
dev_addr[1] = 0x00;
dev_addr[2] = 0x20;
get_random_bytes(&dev_addr[3], 3);
dev_addr[1] = 0x00;
dev_addr[2] = 0x20;
get_random_bytes(&dev_addr[3], 3);
- return;
}
#endif /* !(CONFIG_SPARC) */
}
#endif /* !(CONFIG_SPARC) */
@@
-3004,7
+3001,6
@@
static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
dev->base_addr = (long) pdev;
hp = netdev_priv(dev);
dev->base_addr = (long) pdev;
hp = netdev_priv(dev);
- memset(hp, 0, sizeof(*hp));
hp->happy_dev = pdev;
hp->dma_dev = &pdev->dev;
hp->happy_dev = pdev;
hp->dma_dev = &pdev->dev;