net/pcmcia: convert to use netdev_for_each_mc_addr

removed fill_multicast_tbl function in smc91c92_cs and do the work inline

rewritten set_addresses function in xirc2ps_cs. This was kinda headache.
Simulated the original and new functions and they bahave the same.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 2ee57bd52a01..d90e0fcdbce1 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1625,8 +1625,7 @@ static inline void make_mc_bits(u8 *bits, struct net_device *dev)
         struct dev_mc_list *dmi;
         u32 crc;
 
-        for (dmi=dev->mc_list; dmi; dmi=dmi->next) {
-                
+        netdev_for_each_mc_addr(dmi, dev) {
                 crc = ether_crc(ETH_ALEN, dmi->dmi_addr);
                 /* 
                  * The 8390 uses the 6 most significant bits of the
@@ -1652,7 +1651,7 @@ static void do_set_multicast_list(struct net_device *dev)
 
         if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI))) {
                 memset(ei_local->mcfilter, 0, 8);
-                if (dev->mc_list)
+                if (!netdev_mc_empty(dev))
                         make_mc_bits(ei_local->mcfilter, dev);
         } else {
                 /* set to accept-all */
@@ -1668,7 +1667,7 @@ static void do_set_multicast_list(struct net_device *dev)
 
         if(dev->flags&IFF_PROMISC)
                 outb_p(E8390_RXCONFIG | 0x58, e8390_base + EN0_RXCR);
-        else if(dev->flags&IFF_ALLMULTI || dev->mc_list)
+        else if (dev->flags & IFF_ALLMULTI || !netdev_mc_empty(dev))
                 outb_p(E8390_RXCONFIG | 0x48, e8390_base + EN0_RXCR);
         else
                 outb_p(E8390_RXCONFIG | 0x40, e8390_base + EN0_RXCR);