---

yaml --- r: 4127 b: refs/heads/master c: 52609c0 h: refs/heads/master i: 4125: 7328940 4123: 0929ffb 4119: 414d0c8 4111: cdc8409 4095: 39ad1ee v: v3
git-mirror · Jul 5, 2005 · 2e78df5 · 2e78df5
1 parent 1324fb4
commit 2e78df5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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" :