From 25e00b8f3dcffcaacf50e07e61128384fc402a0e Mon Sep 17 00:00:00 2001
From: Denis Cheng <crquan@gmail.com>
Date: Wed, 18 Jul 2007 02:10:54 -0700
Subject: [PATCH] --- yaml --- r: 61203 b: refs/heads/master c:
 456ad75c89cdb72e11dcdb6b0794802a6f50c8a3 h: refs/heads/master i:   61201:
 b29877071d3938b5ddda38f66c98616672b56a21   61199:
 d42d4a57f07c9761dbc42dd2163d1b7481363f04 v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/netdevice.h |  2 --
 trunk/net/core/dev.c            | 14 +++++++++++++-
 trunk/net/core/dev_mcast.c      | 12 ------------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 4a34ea335d21..ec52de3c13fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb4965344965530411359891214cd6fcab483649
+refs/heads/master: 456ad75c89cdb72e11dcdb6b0794802a6f50c8a3
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index da7a13c97eb8..9820ca1e45e2 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -1098,10 +1098,8 @@ extern int 		dev_mc_delete(struct net_device *dev, void *addr, int alen, int all
 extern int		dev_mc_add(struct net_device *dev, void *addr, int alen, int newonly);
 extern int		dev_mc_sync(struct net_device *to, struct net_device *from);
 extern void		dev_mc_unsync(struct net_device *to, struct net_device *from);
-extern void		dev_mc_discard(struct net_device *dev);
 extern int 		__dev_addr_delete(struct dev_addr_list **list, int *count, void *addr, int alen, int all);
 extern int		__dev_addr_add(struct dev_addr_list **list, int *count, void *addr, int alen, int newonly);
-extern void		__dev_addr_discard(struct dev_addr_list **list);
 extern void		dev_set_promiscuity(struct net_device *dev, int inc);
 extern void		dev_set_allmulti(struct net_device *dev, int inc);
 extern void		netdev_state_change(struct net_device *dev);
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 13a0d9f6da54..3ba63aaa3001 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/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/trunk/net/core/dev_mcast.c b/trunk/net/core/dev_mcast.c
index 235a2a8a0d05..99aece1aeccf 100644
--- a/trunk/net/core/dev_mcast.c
+++ b/trunk/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)
 {