aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hamachi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/hamachi.c')
-rw-r--r--drivers/net/hamachi.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 373546dd0831..83f43bb835d6 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -153,7 +153,6 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
153#include <linux/time.h> 153#include <linux/time.h>
154#include <linux/errno.h> 154#include <linux/errno.h>
155#include <linux/ioport.h> 155#include <linux/ioport.h>
156#include <linux/slab.h>
157#include <linux/interrupt.h> 156#include <linux/interrupt.h>
158#include <linux/pci.h> 157#include <linux/pci.h>
159#include <linux/init.h> 158#include <linux/init.h>
@@ -1858,12 +1857,12 @@ static void set_rx_mode(struct net_device *dev)
1858 /* Too many to match, or accept all multicasts. */ 1857 /* Too many to match, or accept all multicasts. */
1859 writew(0x000B, ioaddr + AddrMode); 1858 writew(0x000B, ioaddr + AddrMode);
1860 } else if (!netdev_mc_empty(dev)) { /* Must use the CAM filter. */ 1859 } else if (!netdev_mc_empty(dev)) { /* Must use the CAM filter. */
1861 struct dev_mc_list *mclist; 1860 struct netdev_hw_addr *ha;
1862 int i = 0; 1861 int i = 0;
1863 1862
1864 netdev_for_each_mc_addr(mclist, dev) { 1863 netdev_for_each_mc_addr(ha, dev) {
1865 writel(*(u32*)(mclist->dmi_addr), ioaddr + 0x100 + i*8); 1864 writel(*(u32 *)(ha->addr), ioaddr + 0x100 + i*8);
1866 writel(0x20000 | (*(u16*)&mclist->dmi_addr[4]), 1865 writel(0x20000 | (*(u16 *)&ha->addr[4]),
1867 ioaddr + 0x104 + i*8); 1866 ioaddr + 0x104 + i*8);
1868 i++; 1867 i++;
1869 } 1868 }