aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ioc3-eth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ioc3-eth.c')
-rw-r--r--drivers/net/ioc3-eth.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 8f6197d647c..e3b5e949060 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1503,7 +1503,6 @@ static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
1503 1503
1504 BARRIER(); 1504 BARRIER();
1505 1505
1506 dev->trans_start = jiffies;
1507 ip->tx_skbs[produce] = skb; /* Remember skb */ 1506 ip->tx_skbs[produce] = skb; /* Remember skb */
1508 produce = (produce + 1) & 127; 1507 produce = (produce + 1) & 127;
1509 ip->tx_pi = produce; 1508 ip->tx_pi = produce;
@@ -1665,7 +1664,7 @@ static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1665 1664
1666static void ioc3_set_multicast_list(struct net_device *dev) 1665static void ioc3_set_multicast_list(struct net_device *dev)
1667{ 1666{
1668 struct dev_mc_list *dmi; 1667 struct netdev_hw_addr *ha;
1669 struct ioc3_private *ip = netdev_priv(dev); 1668 struct ioc3_private *ip = netdev_priv(dev);
1670 struct ioc3 *ioc3 = ip->regs; 1669 struct ioc3 *ioc3 = ip->regs;
1671 u64 ehar = 0; 1670 u64 ehar = 0;
@@ -1689,8 +1688,8 @@ static void ioc3_set_multicast_list(struct net_device *dev)
1689 ip->ehar_h = 0xffffffff; 1688 ip->ehar_h = 0xffffffff;
1690 ip->ehar_l = 0xffffffff; 1689 ip->ehar_l = 0xffffffff;
1691 } else { 1690 } else {
1692 netdev_for_each_mc_addr(dmi, dev) { 1691 netdev_for_each_mc_addr(ha, dev) {
1693 char *addr = dmi->dmi_addr; 1692 char *addr = ha->addr;
1694 1693
1695 if (!(*addr & 1)) 1694 if (!(*addr & 1))
1696 continue; 1695 continue;