diff options
author | Patrick McHardy <kaber@trash.net> | 2007-06-27 04:25:11 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:15:53 -0400 |
commit | 75ebe8f73610636be8bbd8d73db883512850e6be (patch) | |
tree | 60ea3cc1b5fa6a942667d0c9352df838b2f0094b | |
parent | d212f87b068c9d72065ef579d85b5ee6b8b59381 (diff) |
[NET]: dev_mcast: unexport dev_mc_upload
dev_mc_add/dev_mc_delete take care of uploading the list when
necessary and thats the only interface other code should use.
Also remove two incorrect calls in DECnet.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/dev_mcast.c | 1 | ||||
-rw-r--r-- | net/decnet/dn_dev.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c index 5a54053386c8..80bb2e374b76 100644 --- a/net/core/dev_mcast.c +++ b/net/core/dev_mcast.c | |||
@@ -292,4 +292,3 @@ void __init dev_mcast_init(void) | |||
292 | 292 | ||
293 | EXPORT_SYMBOL(dev_mc_add); | 293 | EXPORT_SYMBOL(dev_mc_add); |
294 | EXPORT_SYMBOL(dev_mc_delete); | 294 | EXPORT_SYMBOL(dev_mc_delete); |
295 | EXPORT_SYMBOL(dev_mc_upload); | ||
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index ab41c1879fd4..e31549e9d07a 100644 --- 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) | |||
461 | if (ifa->ifa_local != dn_eth2dn(dev->dev_addr)) { | 461 | if (ifa->ifa_local != dn_eth2dn(dev->dev_addr)) { |
462 | dn_dn2eth(mac_addr, ifa->ifa_local); | 462 | dn_dn2eth(mac_addr, ifa->ifa_local); |
463 | dev_mc_add(dev, mac_addr, ETH_ALEN, 0); | 463 | dev_mc_add(dev, mac_addr, ETH_ALEN, 0); |
464 | dev_mc_upload(dev); | ||
465 | } | 464 | } |
466 | } | 465 | } |
467 | 466 | ||
@@ -1064,8 +1063,6 @@ static int dn_eth_up(struct net_device *dev) | |||
1064 | else | 1063 | else |
1065 | dev_mc_add(dev, dn_rt_all_rt_mcast, ETH_ALEN, 0); | 1064 | dev_mc_add(dev, dn_rt_all_rt_mcast, ETH_ALEN, 0); |
1066 | 1065 | ||
1067 | dev_mc_upload(dev); | ||
1068 | |||
1069 | dn_db->use_long = 1; | 1066 | dn_db->use_long = 1; |
1070 | 1067 | ||
1071 | return 0; | 1068 | return 0; |