From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 12 Sep 2006 15:45:33 +0000 (-0400)
Subject: Merge branch 'tmp' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~37
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4e83b7fad8d3fd55828baa4510885c7362e66a26;p=linux-2.6-omap-h63xx.git

Merge branch 'tmp' into upstream
---

4e83b7fad8d3fd55828baa4510885c7362e66a26
diff --cc drivers/net/tulip/winbond-840.c
index a64d6828d9a,8e7d6f01040..0e5344fe7e2
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@@ -1358,10 -1378,8 +1358,8 @@@ static u32 __set_rx_mode(struct net_dev
  	u32 rx_mode;
  
  	if (dev->flags & IFF_PROMISC) {			/* Set promiscuous. */
- 		/* Unconditionally log net taps. */
- 		printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
  		memset(mc_filter, 0xff, sizeof(mc_filter));
 -		rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAllPhys
 +		rx_mode = RxAcceptBroadcast | AcceptMulticast | RxAcceptAllPhys
  			| AcceptMyPhys;
  	} else if ((dev->mc_count > multicast_filter_limit)
  			   ||  (dev->flags & IFF_ALLMULTI)) {