2 files changed, 13 insertions, 13 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 13a0d9f6da54..3ba63aaa3001 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2715,7 +2715,7 @@ int __dev_addr_add(struct dev_addr_list **list, int *count,
         return 0;
 }
 
-void __dev_addr_discard(struct dev_addr_list **list)
+static void __dev_addr_discard(struct dev_addr_list **list)
 {
         struct dev_addr_list *tmp;
 
@@ -2785,6 +2785,18 @@ static void dev_unicast_discard(struct net_device *dev)
         netif_tx_unlock_bh(dev);
 }
 
+/*
+ *      Discard multicast list when a device is downed
+ */
+
+static void dev_mc_discard(struct net_device *dev)
+{
+        netif_tx_lock_bh(dev);
+        __dev_addr_discard(&dev->mc_list);
+        dev->mc_count = 0;
+        netif_tx_unlock_bh(dev);
+}
+
 unsigned dev_get_flags(const struct net_device *dev)
 {
         unsigned flags;
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index 235a2a8a0d05..99aece1aeccf 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -177,18 +177,6 @@ void dev_mc_unsync(struct net_device *to, struct net_device *from)
 }
 EXPORT_SYMBOL(dev_mc_unsync);
 
-/*
- *      Discard multicast list when a device is downed
- */
-
-void dev_mc_discard(struct net_device *dev)
-{
-        netif_tx_lock_bh(dev);
-        __dev_addr_discard(&dev->mc_list);
-        dev->mc_count = 0;
-        netif_tx_unlock_bh(dev);
-}
-
 #ifdef CONFIG_PROC_FS
 static void *dev_mc_seq_start(struct seq_file *seq, loff_t *pos)
 {