From bb4e8fd89618efaff392d1426061170e6dbde8e1 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sun, 6 Jul 2008 15:49:08 -0700
Subject: [PATCH] --- yaml --- r: 103315 b: refs/heads/master c:
 4b5a698ef423eebc37cfacc6d3376d6dffd5bf83 h: refs/heads/master i:   103313:
 4efa54a70b90e6523db64390a1352c3bf0ebb95d   103311:
 a797481025f02ceddc311025d1a6a3d20766b2bb v: v3

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

diff --git a/[refs] b/[refs]
index 5d42491716a3..9186a677b9bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb0305ce1b03f6ff17f84f2c63daccecb45f2805
+refs/heads/master: 4b5a698ef423eebc37cfacc6d3376d6dffd5bf83
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index bfa9a6a951dd..75933932463d 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2859,7 +2859,7 @@ int dev_set_promiscuity(struct net_device *dev, int inc)
 	int err;
 
 	err = __dev_set_promiscuity(dev, inc);
-	if (!err)
+	if (err < 0)
 		return err;
 	if (dev->flags != old_flags)
 		dev_set_rx_mode(dev);