aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/3c359.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tokenring/3c359.c')
-rw-r--r--drivers/net/tokenring/3c359.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 8c54d89e60d7..4673e38c52a9 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -1390,7 +1390,7 @@ static int xl_close(struct net_device *dev)
1390static void xl_set_rx_mode(struct net_device *dev) 1390static void xl_set_rx_mode(struct net_device *dev)
1391{ 1391{
1392 struct xl_private *xl_priv = netdev_priv(dev); 1392 struct xl_private *xl_priv = netdev_priv(dev);
1393 struct dev_mc_list *dmi; 1393 struct netdev_hw_addr *ha;
1394 unsigned char dev_mc_address[4] ; 1394 unsigned char dev_mc_address[4] ;
1395 u16 options ; 1395 u16 options ;
1396 1396
@@ -1407,11 +1407,11 @@ static void xl_set_rx_mode(struct net_device *dev)
1407 1407
1408 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; 1408 dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ;
1409 1409
1410 netdev_for_each_mc_addr(dmi, dev) { 1410 netdev_for_each_mc_addr(ha, dev) {
1411 dev_mc_address[0] |= dmi->dmi_addr[2] ; 1411 dev_mc_address[0] |= ha->addr[2];
1412 dev_mc_address[1] |= dmi->dmi_addr[3] ; 1412 dev_mc_address[1] |= ha->addr[3];
1413 dev_mc_address[2] |= dmi->dmi_addr[4] ; 1413 dev_mc_address[2] |= ha->addr[4];
1414 dev_mc_address[3] |= dmi->dmi_addr[5] ; 1414 dev_mc_address[3] |= ha->addr[5];
1415 } 1415 }
1416 1416
1417 if (memcmp(xl_priv->xl_functional_addr,dev_mc_address,4) != 0) { /* Options have changed, run the command */ 1417 if (memcmp(xl_priv->xl_functional_addr,dev_mc_address,4) != 0) { /* Options have changed, run the command */