net: use netdev_mc_count and netdev_mc_empty when appropriate

[net-next-2.6.git] / drivers / staging / et131x / et131x_netdev.c

diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c
index 24d97b4fa6fbb7e8dab8ca2073389f6816c0cb51..bc1fad248952522ff2e1148ec181af32de70a2d0 100644 (file)
--- a/drivers/staging/et131x/et131x_netdev.c
+++ b/drivers/staging/et131x/et131x_netdev.c
@@ -444,11 +444,11 @@ void et131x_multicast(struct net_device *netdev)
                adapter->PacketFilter |= ET131X_PACKET_TYPE_ALL_MULTICAST;
        }
 
-       if (netdev->mc_count > NIC_MAX_MCAST_LIST) {
+       if (netdev_mc_count(netdev) > NIC_MAX_MCAST_LIST) {
                adapter->PacketFilter |= ET131X_PACKET_TYPE_ALL_MULTICAST;
        }
 
-       if (netdev->mc_count < 1) {
+       if (netdev_mc_count(netdev) < 1) {
                adapter->PacketFilter &= ~ET131X_PACKET_TYPE_ALL_MULTICAST;
                adapter->PacketFilter &= ~ET131X_PACKET_TYPE_MULTICAST;
        } else {
@@ -456,10 +456,10 @@ void et131x_multicast(struct net_device *netdev)
        }
 
        /* Set values in the private adapter struct */
-       adapter->MCAddressCount = netdev->mc_count;
+       adapter->MCAddressCount = netdev_mc_count(netdev);
 
-       if (netdev->mc_count) {
-               count = netdev->mc_count - 1;
+       if (!netdev_mc_empty(netdev)) {
+               count = netdev_mc_count(netdev) - 1;
                memcpy(adapter->MCList[count], mclist->dmi_addr, ETH_ALEN);
        }