Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / octeon / octeon_mgmt.c

diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c
index 8aadc8e2ddd7e062bde2c2a0757019bcfd746ae6..0e2ff1ec58e4dcc6497f19e454b961cfa43061d3 100644 (file)
--- a/drivers/net/octeon/octeon_mgmt.c
+++ b/drivers/net/octeon/octeon_mgmt.c
@@ -475,7 +475,7 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
        unsigned int cam_mode = 1; /* 1 - Accept on CAM match */
        unsigned int multicast_mode = 1; /* 1 - Reject all multicast.  */
        struct octeon_mgmt_cam_state cam_state;
-       struct dev_addr_list *list;
+       struct netdev_hw_addr *ha;
        struct list_head *pos;
        int available_cam_entries;
 
@@ -511,8 +511,8 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
                }
        }
        if (multicast_mode == 0) {
-               netdev_for_each_mc_addr(list, netdev)
-                       octeon_mgmt_cam_state_add(&cam_state, list->da_addr);
+               netdev_for_each_mc_addr(ha, netdev)
+                       octeon_mgmt_cam_state_add(&cam_state, ha->addr);
        }