diff options
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 332c60356285..458272196997 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> | 
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> | 
| 29 | #include <linux/ssb/ssb.h> | 29 | #include <linux/ssb/ssb.h> | 
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> | 
| 32 | #include <asm/io.h> | 33 | #include <asm/io.h> | 
| @@ -1680,15 +1681,15 @@ static struct net_device_stats *b44_get_stats(struct net_device *dev) | |||
| 1680 | 1681 | ||
| 1681 | static int __b44_load_mcast(struct b44 *bp, struct net_device *dev) | 1682 | static int __b44_load_mcast(struct b44 *bp, struct net_device *dev) | 
| 1682 | { | 1683 | { | 
| 1683 | struct dev_mc_list *mclist; | 1684 | struct netdev_hw_addr *ha; | 
| 1684 | int i, num_ents; | 1685 | int i, num_ents; | 
| 1685 | 1686 | ||
| 1686 | num_ents = min_t(int, netdev_mc_count(dev), B44_MCAST_TABLE_SIZE); | 1687 | num_ents = min_t(int, netdev_mc_count(dev), B44_MCAST_TABLE_SIZE); | 
| 1687 | i = 0; | 1688 | i = 0; | 
| 1688 | netdev_for_each_mc_addr(mclist, dev) { | 1689 | netdev_for_each_mc_addr(ha, dev) { | 
| 1689 | if (i == num_ents) | 1690 | if (i == num_ents) | 
| 1690 | break; | 1691 | break; | 
| 1691 | __b44_cam_write(bp, mclist->dmi_addr, i++ + 1); | 1692 | __b44_cam_write(bp, ha->addr, i++ + 1); | 
| 1692 | } | 1693 | } | 
| 1693 | return i+1; | 1694 | return i+1; | 
| 1694 | } | 1695 | } | 
