Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 0 insertions, 7 deletions

diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index 3f5190c654cf..d454e143483e 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -488,13 +488,6 @@ static void de620_set_multicast_list(struct net_device *dev)
 {
         if (dev->mc_count || dev->flags&(IFF_ALLMULTI|IFF_PROMISC))
         { /* Enable promiscuous mode */
-                /*
-                 *      We must make the kernel realise we had to move
-                 *      into promisc mode or we start all out war on
-                 *      the cable. - AC
-                 */
-                dev->flags|=IFF_PROMISC;
-
                 de620_set_register(dev, W_TCR, (TCR_DEF & ~RXPBM) | RXALL);
         }
         else