aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/amd8111e.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/amd8111e.c')
-rw-r--r--drivers/net/amd8111e.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index b8a59d255b49..97d71a960602 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -73,7 +73,6 @@ Revision History:
73#include <linux/kernel.h> 73#include <linux/kernel.h>
74#include <linux/types.h> 74#include <linux/types.h>
75#include <linux/compiler.h> 75#include <linux/compiler.h>
76#include <linux/slab.h>
77#include <linux/delay.h> 76#include <linux/delay.h>
78#include <linux/init.h> 77#include <linux/init.h>
79#include <linux/ioport.h> 78#include <linux/ioport.h>
@@ -1377,7 +1376,7 @@ list to the device.
1377*/ 1376*/
1378static void amd8111e_set_multicast_list(struct net_device *dev) 1377static void amd8111e_set_multicast_list(struct net_device *dev)
1379{ 1378{
1380 struct dev_mc_list *mc_ptr; 1379 struct netdev_hw_addr *ha;
1381 struct amd8111e_priv *lp = netdev_priv(dev); 1380 struct amd8111e_priv *lp = netdev_priv(dev);
1382 u32 mc_filter[2] ; 1381 u32 mc_filter[2] ;
1383 int bit_num; 1382 int bit_num;
@@ -1408,8 +1407,8 @@ static void amd8111e_set_multicast_list(struct net_device *dev)
1408 /* load all the multicast addresses in the logic filter */ 1407 /* load all the multicast addresses in the logic filter */
1409 lp->options |= OPTION_MULTICAST_ENABLE; 1408 lp->options |= OPTION_MULTICAST_ENABLE;
1410 mc_filter[1] = mc_filter[0] = 0; 1409 mc_filter[1] = mc_filter[0] = 0;
1411 netdev_for_each_mc_addr(mc_ptr, dev) { 1410 netdev_for_each_mc_addr(ha, dev) {
1412 bit_num = (ether_crc_le(ETH_ALEN, mc_ptr->dmi_addr) >> 26) & 0x3f; 1411 bit_num = (ether_crc_le(ETH_ALEN, ha->addr) >> 26) & 0x3f;
1413 mc_filter[bit_num >> 5] |= 1 << (bit_num & 31); 1412 mc_filter[bit_num >> 5] |= 1 << (bit_num & 31);
1414 } 1413 }
1415 amd8111e_writeq(*(u64*)mc_filter,lp->mmio+ LADRF); 1414 amd8111e_writeq(*(u64*)mc_filter,lp->mmio+ LADRF);