diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-07 23:30:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-12 14:38:58 -0500 |
commit | 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 (patch) | |
tree | 99f57f6374a58022e1e5ed1cbc12699288c7eae1 /drivers/net/octeon | |
parent | 8e5574211d96c0552f84c757718475fdb4021be7 (diff) |
net: use netdev_mc_count and netdev_mc_empty when appropriate
This patch replaces dev->mc_count in all drivers (hopefully I didn't miss
anything). Used spatch and did small tweaks and conding style changes when
it was suitable.
Jirka
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/octeon')
-rw-r--r-- | drivers/net/octeon/octeon_mgmt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c index 6fd8789ef487..3a0f910924a5 100644 --- a/drivers/net/octeon/octeon_mgmt.c +++ b/drivers/net/octeon/octeon_mgmt.c | |||
@@ -493,8 +493,8 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev) | |||
493 | } | 493 | } |
494 | 494 | ||
495 | if (netdev->flags & IFF_MULTICAST) { | 495 | if (netdev->flags & IFF_MULTICAST) { |
496 | if (cam_mode == 0 || (netdev->flags & IFF_ALLMULTI) | 496 | if (cam_mode == 0 || (netdev->flags & IFF_ALLMULTI) || |
497 | || netdev->mc_count > available_cam_entries) | 497 | netdev_mc_count(netdev) > available_cam_entries) |
498 | multicast_mode = 2; /* 1 - Accept all multicast. */ | 498 | multicast_mode = 2; /* 1 - Accept all multicast. */ |
499 | else | 499 | else |
500 | multicast_mode = 0; /* 0 - Use CAM. */ | 500 | multicast_mode = 0; /* 0 - Use CAM. */ |
@@ -511,7 +511,7 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev) | |||
511 | } | 511 | } |
512 | } | 512 | } |
513 | if (multicast_mode == 0) { | 513 | if (multicast_mode == 0) { |
514 | i = netdev->mc_count; | 514 | i = netdev_mc_count(netdev); |
515 | list = netdev->mc_list; | 515 | list = netdev->mc_list; |
516 | while (i--) { | 516 | while (i--) { |
517 | octeon_mgmt_cam_state_add(&cam_state, list->da_addr); | 517 | octeon_mgmt_cam_state_add(&cam_state, list->da_addr); |