From e63489dc8fbff8b472c24eb3ea81717adab7556b Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 27 Jun 2007 01:25:11 -0700
Subject: [PATCH] --- yaml --- r: 58933 b: refs/heads/master c:
 75ebe8f73610636be8bbd8d73db883512850e6be h: refs/heads/master i:   58931:
 4fe08827f7abfc65c5502ca6cb3b3ff14ae5466d v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/dev_mcast.c | 1 -
 trunk/net/decnet/dn_dev.c  | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 15a09d40d9a6..73618a43dd85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d212f87b068c9d72065ef579d85b5ee6b8b59381
+refs/heads/master: 75ebe8f73610636be8bbd8d73db883512850e6be
diff --git a/trunk/net/core/dev_mcast.c b/trunk/net/core/dev_mcast.c
index 5a54053386c8..80bb2e374b76 100644
--- a/trunk/net/core/dev_mcast.c
+++ b/trunk/net/core/dev_mcast.c
@@ -292,4 +292,3 @@ void __init dev_mcast_init(void)
 
 EXPORT_SYMBOL(dev_mc_add);
 EXPORT_SYMBOL(dev_mc_delete);
-EXPORT_SYMBOL(dev_mc_upload);
diff --git a/trunk/net/decnet/dn_dev.c b/trunk/net/decnet/dn_dev.c
index ab41c1879fd4..e31549e9d07a 100644
--- a/trunk/net/decnet/dn_dev.c
+++ b/trunk/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;