aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/3c359.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-02-17 21:47:07 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-18 17:47:51 -0500
commit16cad981863344ef779ab703545bb6f261a0f0ce (patch)
treedeb1a258936b2f8e18b5c53fdabaf639129a84f3 /drivers/net/tokenring/3c359.c
parentd59079425f6f1be0da995926b5ad1d54d9e4545d (diff)
tokenring: convert to use netdev_for_each_mc_addr
Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tokenring/3c359.c')
-rw-r--r--drivers/net/tokenring/3c359.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index eff68e1d107b..0fb930feea45 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -1390,10 +1390,9 @@ 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 dev_mc_list *dmi;
1394 unsigned char dev_mc_address[4] ; 1394 unsigned char dev_mc_address[4] ;
1395 u16 options ; 1395 u16 options ;
1396 int i ;
1397 1396
1398 if (dev->flags & IFF_PROMISC) 1397 if (dev->flags & IFF_PROMISC)
1399 options = 0x0004 ; 1398 options = 0x0004 ;
@@ -1408,7 +1407,7 @@ static void xl_set_rx_mode(struct net_device *dev)
1408 1407
1409 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 ;
1410 1409
1411 for (i=0,dmi=dev->mc_list;i < netdev_mc_count(dev); i++,dmi = dmi->next) { 1410 netdev_for_each_mc_addr(dmi, dev) {
1412 dev_mc_address[0] |= dmi->dmi_addr[2] ; 1411 dev_mc_address[0] |= dmi->dmi_addr[2] ;
1413 dev_mc_address[1] |= dmi->dmi_addr[3] ; 1412 dev_mc_address[1] |= dmi->dmi_addr[3] ;
1414 dev_mc_address[2] |= dmi->dmi_addr[4] ; 1413 dev_mc_address[2] |= dmi->dmi_addr[4] ;