aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-02-23 04:54:58 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-26 05:08:33 -0500
commitfbc450b137e59205b98a172326415cd981c9caa6 (patch)
treee9bb0a901ed69c7699069bd323b098b216f57499 /drivers
parent567ec874d15b478c8eda7e9a5d2dcb05f13f1fb5 (diff)
octeon: convert to use netdev_for_each_mc_addr
Hmm so actually my original patch including this bit was correct, "list = list->next;" confused me :) - will send patch correcting that in a few. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/octeon/octeon_mgmt.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c
index 3a0f910924a5..be368e5cbf75 100644
--- a/drivers/net/octeon/octeon_mgmt.c
+++ b/drivers/net/octeon/octeon_mgmt.c
@@ -467,7 +467,6 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
467{ 467{
468 struct octeon_mgmt *p = netdev_priv(netdev); 468 struct octeon_mgmt *p = netdev_priv(netdev);
469 int port = p->port; 469 int port = p->port;
470 int i;
471 union cvmx_agl_gmx_rxx_adr_ctl adr_ctl; 470 union cvmx_agl_gmx_rxx_adr_ctl adr_ctl;
472 union cvmx_agl_gmx_prtx_cfg agl_gmx_prtx; 471 union cvmx_agl_gmx_prtx_cfg agl_gmx_prtx;
473 unsigned long flags; 472 unsigned long flags;
@@ -511,12 +510,8 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
511 } 510 }
512 } 511 }
513 if (multicast_mode == 0) { 512 if (multicast_mode == 0) {
514 i = netdev_mc_count(netdev); 513 netdev_for_each_mc_addr(list, netdev)
515 list = netdev->mc_list;
516 while (i--) {
517 octeon_mgmt_cam_state_add(&cam_state, list->da_addr); 514 octeon_mgmt_cam_state_add(&cam_state, list->da_addr);
518 list = list->next;
519 }
520 } 515 }
521 516
522 517