aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sis900.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-02-07 23:30:35 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-12 14:38:58 -0500
commit4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 (patch)
tree99f57f6374a58022e1e5ed1cbc12699288c7eae1 /drivers/net/sis900.c
parent8e5574211d96c0552f84c757718475fdb4021be7 (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/sis900.c')
-rw-r--r--drivers/net/sis900.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 20c5ce474891..32ae87c09f5e 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -2288,7 +2288,7 @@ static void set_rx_mode(struct net_device *net_dev)
2288 rx_mode = RFPromiscuous; 2288 rx_mode = RFPromiscuous;
2289 for (i = 0; i < table_entries; i++) 2289 for (i = 0; i < table_entries; i++)
2290 mc_filter[i] = 0xffff; 2290 mc_filter[i] = 0xffff;
2291 } else if ((net_dev->mc_count > multicast_filter_limit) || 2291 } else if ((netdev_mc_count(net_dev) > multicast_filter_limit) ||
2292 (net_dev->flags & IFF_ALLMULTI)) { 2292 (net_dev->flags & IFF_ALLMULTI)) {
2293 /* too many multicast addresses or accept all multicast packet */ 2293 /* too many multicast addresses or accept all multicast packet */
2294 rx_mode = RFAAB | RFAAM; 2294 rx_mode = RFAAB | RFAAM;
@@ -2301,7 +2301,7 @@ static void set_rx_mode(struct net_device *net_dev)
2301 struct dev_mc_list *mclist; 2301 struct dev_mc_list *mclist;
2302 rx_mode = RFAAB; 2302 rx_mode = RFAAB;
2303 for (i = 0, mclist = net_dev->mc_list; 2303 for (i = 0, mclist = net_dev->mc_list;
2304 mclist && i < net_dev->mc_count; 2304 mclist && i < netdev_mc_count(net_dev);
2305 i++, mclist = mclist->next) { 2305 i++, mclist = mclist->next) {
2306 unsigned int bit_nr = 2306 unsigned int bit_nr =
2307 sis900_mcast_bitnr(mclist->dmi_addr, sis_priv->chipset_rev); 2307 sis900_mcast_bitnr(mclist->dmi_addr, sis_priv->chipset_rev);