diff options
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r-- | drivers/net/b44.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 69d9f3d368ae..293f9c16e786 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -1014,8 +1014,6 @@ static netdev_tx_t b44_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1014 | if (TX_BUFFS_AVAIL(bp) < 1) | 1014 | if (TX_BUFFS_AVAIL(bp) < 1) |
1015 | netif_stop_queue(dev); | 1015 | netif_stop_queue(dev); |
1016 | 1016 | ||
1017 | dev->trans_start = jiffies; | ||
1018 | |||
1019 | out_unlock: | 1017 | out_unlock: |
1020 | spin_unlock_irqrestore(&bp->lock, flags); | 1018 | spin_unlock_irqrestore(&bp->lock, flags); |
1021 | 1019 | ||
@@ -1681,15 +1679,15 @@ static struct net_device_stats *b44_get_stats(struct net_device *dev) | |||
1681 | 1679 | ||
1682 | static int __b44_load_mcast(struct b44 *bp, struct net_device *dev) | 1680 | static int __b44_load_mcast(struct b44 *bp, struct net_device *dev) |
1683 | { | 1681 | { |
1684 | struct dev_mc_list *mclist; | 1682 | struct netdev_hw_addr *ha; |
1685 | int i, num_ents; | 1683 | int i, num_ents; |
1686 | 1684 | ||
1687 | num_ents = min_t(int, netdev_mc_count(dev), B44_MCAST_TABLE_SIZE); | 1685 | num_ents = min_t(int, netdev_mc_count(dev), B44_MCAST_TABLE_SIZE); |
1688 | i = 0; | 1686 | i = 0; |
1689 | netdev_for_each_mc_addr(mclist, dev) { | 1687 | netdev_for_each_mc_addr(ha, dev) { |
1690 | if (i == num_ents) | 1688 | if (i == num_ents) |
1691 | break; | 1689 | break; |
1692 | __b44_cam_write(bp, mclist->dmi_addr, i++ + 1); | 1690 | __b44_cam_write(bp, ha->addr, i++ + 1); |
1693 | } | 1691 | } |
1694 | return i+1; | 1692 | return i+1; |
1695 | } | 1693 | } |