aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index c97b6e4365a9..4ee9d04f6599 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -54,6 +54,7 @@
54#include <linux/io.h> 54#include <linux/io.h>
55#include <linux/types.h> 55#include <linux/types.h>
56#include <linux/inet_lro.h> 56#include <linux/inet_lro.h>
57#include <linux/slab.h>
57#include <asm/system.h> 58#include <asm/system.h>
58 59
59static char mv643xx_eth_driver_name[] = "mv643xx_eth"; 60static char mv643xx_eth_driver_name[] = "mv643xx_eth";
@@ -1769,7 +1770,7 @@ static void mv643xx_eth_program_multicast_filter(struct net_device *dev)
1769 struct mv643xx_eth_private *mp = netdev_priv(dev); 1770 struct mv643xx_eth_private *mp = netdev_priv(dev);
1770 u32 *mc_spec; 1771 u32 *mc_spec;
1771 u32 *mc_other; 1772 u32 *mc_other;
1772 struct dev_addr_list *addr; 1773 struct netdev_hw_addr *ha;
1773 int i; 1774 int i;
1774 1775
1775 if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) { 1776 if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) {
@@ -1794,8 +1795,8 @@ oom:
1794 memset(mc_spec, 0, 0x100); 1795 memset(mc_spec, 0, 0x100);
1795 memset(mc_other, 0, 0x100); 1796 memset(mc_other, 0, 0x100);
1796 1797
1797 netdev_for_each_mc_addr(addr, dev) { 1798 netdev_for_each_mc_addr(ha, dev) {
1798 u8 *a = addr->da_addr; 1799 u8 *a = ha->addr;
1799 u32 *table; 1800 u32 *table;
1800 int entry; 1801 int entry;
1801 1802