Merge branch 'master' of /repos/git/net-next-2.6

[net-next-2.6.git] / net / decnet / dn_dev.c

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 238af093495b2448e140fbf3366c0ad45ef8d1f0..615dbe3b43f9d01139b3d65a17f71f8a6d661572 100644 (file)
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -40,6 +40,7 @@
 #include <linux/skbuff.h>
 #include <linux/sysctl.h>
 #include <linux/notifier.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <net/net_namespace.h>
@@ -349,7 +350,7 @@ static void dn_dev_del_ifa(struct dn_dev *dn_db, struct dn_ifaddr **ifap, int de
        if (dn_db->dev->type == ARPHRD_ETHER) {
                if (ifa1->ifa_local != dn_eth2dn(dev->dev_addr)) {
                        dn_dn2eth(mac_addr, ifa1->ifa_local);
-                       dev_mc_delete(dev, mac_addr, ETH_ALEN, 0);
+                       dev_mc_del(dev, mac_addr);
                }
        }
 
@@ -380,7 +381,7 @@ static int dn_dev_insert_ifa(struct dn_dev *dn_db, struct dn_ifaddr *ifa)
        if (dev->type == ARPHRD_ETHER) {
                if (ifa->ifa_local != dn_eth2dn(dev->dev_addr)) {
                        dn_dn2eth(mac_addr, ifa->ifa_local);
-                       dev_mc_add(dev, mac_addr, ETH_ALEN, 0);
+                       dev_mc_add(dev, mac_addr);
                }
        }
 
@@ -1000,9 +1001,9 @@ static int dn_eth_up(struct net_device *dev)
        struct dn_dev *dn_db = dev->dn_ptr;
 
        if (dn_db->parms.forwarding == 0)
-               dev_mc_add(dev, dn_rt_all_end_mcast, ETH_ALEN, 0);
+               dev_mc_add(dev, dn_rt_all_end_mcast);
        else
-               dev_mc_add(dev, dn_rt_all_rt_mcast, ETH_ALEN, 0);
+               dev_mc_add(dev, dn_rt_all_rt_mcast);
 
        dn_db->use_long = 1;
 
@@ -1014,9 +1015,9 @@ static void dn_eth_down(struct net_device *dev)
        struct dn_dev *dn_db = dev->dn_ptr;
 
        if (dn_db->parms.forwarding == 0)
-               dev_mc_delete(dev, dn_rt_all_end_mcast, ETH_ALEN, 0);
+               dev_mc_del(dev, dn_rt_all_end_mcast);
        else
-               dev_mc_delete(dev, dn_rt_all_rt_mcast, ETH_ALEN, 0);
+               dev_mc_del(dev, dn_rt_all_rt_mcast);
 }
 
 static void dn_dev_set_timer(struct net_device *dev);