From 2e78df5d84335793ecb34af6f83f817862a84cc7 Mon Sep 17 00:00:00 2001
From: David Chau <ddcc@mit.edu>
Date: Tue, 5 Jul 2005 15:11:06 -0700
Subject: [PATCH] --- yaml --- r: 4127 b: refs/heads/master c:
 52609c0b56d7c8dfb6e16ec0a715adf8fcbdae36 h: refs/heads/master i:   4125:
 73289402fd5670627f84fedeea0a58956bf3721b   4123:
 0929ffb03b05790dd964d0567f17850192d33c97   4119:
 414d0c816f9eb0ff89f33d874679df63e95fad09   4111:
 cdc84095fd5cdbadd348a00706fd28fb28cd2dda   4095:
 39ad1eed1795cfe398d90d135adf04b6fc26ea86 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d991f9d0291c..d53c94d33dfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc971dee6ece1fd0d431948924becd9c50e7b778
+refs/heads/master: 52609c0b56d7c8dfb6e16ec0a715adf8fcbdae36
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 7016e0c36b3d..7f5f62c65115 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2089,10 +2089,11 @@ void dev_set_promiscuity(struct net_device *dev, int inc)
 {
 	unsigned short old_flags = dev->flags;
 
-	dev->flags |= IFF_PROMISC;
 	if ((dev->promiscuity += inc) == 0)
 		dev->flags &= ~IFF_PROMISC;
-	if (dev->flags ^ old_flags) {
+	else
+		dev->flags |= IFF_PROMISC;
+	if (dev->flags != old_flags) {
 		dev_mc_upload(dev);
 		printk(KERN_INFO "device %s %s promiscuous mode\n",
 		       dev->name, (dev->flags & IFF_PROMISC) ? "entered" :