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/skge.c | |
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/skge.c')
-rw-r--r-- | drivers/net/skge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 5ff46eb18d0c..36ead52dea71 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -2932,7 +2932,7 @@ static void genesis_set_multicast(struct net_device *dev) | |||
2932 | struct skge_port *skge = netdev_priv(dev); | 2932 | struct skge_port *skge = netdev_priv(dev); |
2933 | struct skge_hw *hw = skge->hw; | 2933 | struct skge_hw *hw = skge->hw; |
2934 | int port = skge->port; | 2934 | int port = skge->port; |
2935 | int i, count = dev->mc_count; | 2935 | int i, count = netdev_mc_count(dev); |
2936 | struct dev_mc_list *list = dev->mc_list; | 2936 | struct dev_mc_list *list = dev->mc_list; |
2937 | u32 mode; | 2937 | u32 mode; |
2938 | u8 filter[8]; | 2938 | u8 filter[8]; |
@@ -2987,7 +2987,7 @@ static void yukon_set_multicast(struct net_device *dev) | |||
2987 | reg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA); | 2987 | reg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA); |
2988 | else if (dev->flags & IFF_ALLMULTI) /* all multicast */ | 2988 | else if (dev->flags & IFF_ALLMULTI) /* all multicast */ |
2989 | memset(filter, 0xff, sizeof(filter)); | 2989 | memset(filter, 0xff, sizeof(filter)); |
2990 | else if (dev->mc_count == 0 && !rx_pause)/* no multicast */ | 2990 | else if (netdev_mc_empty(dev) && !rx_pause)/* no multicast */ |
2991 | reg &= ~GM_RXCR_MCF_ENA; | 2991 | reg &= ~GM_RXCR_MCF_ENA; |
2992 | else { | 2992 | else { |
2993 | int i; | 2993 | int i; |
@@ -2996,7 +2996,7 @@ static void yukon_set_multicast(struct net_device *dev) | |||
2996 | if (rx_pause) | 2996 | if (rx_pause) |
2997 | yukon_add_filter(filter, pause_mc_addr); | 2997 | yukon_add_filter(filter, pause_mc_addr); |
2998 | 2998 | ||
2999 | for (i = 0; list && i < dev->mc_count; i++, list = list->next) | 2999 | for (i = 0; list && i < netdev_mc_count(dev); i++, list = list->next) |
3000 | yukon_add_filter(filter, list->dmi_addr); | 3000 | yukon_add_filter(filter, list->dmi_addr); |
3001 | } | 3001 | } |
3002 | 3002 | ||