autofs4: deadlock during create

[linux-2.6-omap-h63xx.git] / net / decnet / dn_dev.c

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index ab41c1879fd498612f15e5356ab6a06a063d4050..fa6604fcf0e7875837180953c47db8bd42525098 100644 (file)
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -461,7 +461,6 @@ static int dn_dev_insert_ifa(struct dn_dev *dn_db, struct dn_ifaddr *ifa)
                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_upload(dev);
                }
        }
 
@@ -1064,8 +1063,6 @@ static int dn_eth_up(struct net_device *dev)
        else
                dev_mc_add(dev, dn_rt_all_rt_mcast, ETH_ALEN, 0);
 
-       dev_mc_upload(dev);
-
        dn_db->use_long = 1;
 
        return 0;
@@ -1419,7 +1416,7 @@ static int dn_dev_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations dn_dev_seq_ops = {
+static const struct seq_operations dn_dev_seq_ops = {
        .start  = dn_dev_seq_start,
        .next   = dn_dev_seq_next,
        .stop   = dn_dev_seq_stop,