aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sunbmac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sunbmac.c')
-rw-r--r--drivers/net/sunbmac.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index ed7865a0b5b2..4591fe9bf0b9 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -362,7 +362,7 @@ static void bigmac_tcvr_write(struct bigmac *bp, void __iomem *tregs,
362 default: 362 default:
363 printk(KERN_ERR "bigmac_tcvr_read: Whoops, no known transceiver type.\n"); 363 printk(KERN_ERR "bigmac_tcvr_read: Whoops, no known transceiver type.\n");
364 return; 364 return;
365 }; 365 }
366 366
367 idle_transceiver(tregs); 367 idle_transceiver(tregs);
368 write_tcvr_bit(bp, tregs, 0); 368 write_tcvr_bit(bp, tregs, 0);
@@ -401,7 +401,7 @@ static unsigned short bigmac_tcvr_read(struct bigmac *bp,
401 default: 401 default:
402 printk(KERN_ERR "bigmac_tcvr_read: Whoops, no known transceiver type.\n"); 402 printk(KERN_ERR "bigmac_tcvr_read: Whoops, no known transceiver type.\n");
403 return 0xffff; 403 return 0xffff;
404 }; 404 }
405 405
406 idle_transceiver(tregs); 406 idle_transceiver(tregs);
407 write_tcvr_bit(bp, tregs, 0); 407 write_tcvr_bit(bp, tregs, 0);
@@ -982,8 +982,6 @@ static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
982 sbus_writel(CREG_CTRL_TWAKEUP, bp->creg + CREG_CTRL); 982 sbus_writel(CREG_CTRL_TWAKEUP, bp->creg + CREG_CTRL);
983 983
984 984
985 dev->trans_start = jiffies;
986
987 return NETDEV_TX_OK; 985 return NETDEV_TX_OK;
988} 986}
989 987
@@ -999,7 +997,7 @@ static void bigmac_set_multicast(struct net_device *dev)
999{ 997{
1000 struct bigmac *bp = netdev_priv(dev); 998 struct bigmac *bp = netdev_priv(dev);
1001 void __iomem *bregs = bp->bregs; 999 void __iomem *bregs = bp->bregs;
1002 struct dev_mc_list *dmi; 1000 struct netdev_hw_addr *ha;
1003 char *addrs; 1001 char *addrs;
1004 int i; 1002 int i;
1005 u32 tmp, crc; 1003 u32 tmp, crc;
@@ -1028,8 +1026,8 @@ static void bigmac_set_multicast(struct net_device *dev)
1028 for (i = 0; i < 4; i++) 1026 for (i = 0; i < 4; i++)
1029 hash_table[i] = 0; 1027 hash_table[i] = 0;
1030 1028
1031 netdev_for_each_mc_addr(dmi, dev) { 1029 netdev_for_each_mc_addr(ha, dev) {
1032 addrs = dmi->dmi_addr; 1030 addrs = ha->addr;
1033 1031
1034 if (!(*addrs & 1)) 1032 if (!(*addrs & 1))
1035 continue; 1033 continue;