aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-07-06 18:49:08 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-06 18:49:08 -0400
commit4b5a698ef423eebc37cfacc6d3376d6dffd5bf83 (patch)
treefc887610dc023d19c9abbe7189a5719ee35c7f67
parentfb0305ce1b03f6ff17f84f2c63daccecb45f2805 (diff)
net: fix dev_set_promiscuity() breakage
Commit dad9b335 (netdevice: Fix promiscuity and allmulti overflow) broke dev_set_promiscuity() by returning on success without reprogramming the device. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index bfa9a6a951dd..75933932463d 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2859,7 +2859,7 @@ int dev_set_promiscuity(struct net_device *dev, int inc)
2859 int err; 2859 int err;
2860 2860
2861 err = __dev_set_promiscuity(dev, inc); 2861 err = __dev_set_promiscuity(dev, inc);
2862 if (!err) 2862 if (err < 0)
2863 return err; 2863 return err;
2864 if (dev->flags != old_flags) 2864 if (dev->flags != old_flags)
2865 dev_set_rx_mode(dev); 2865 dev_set_rx_mode(dev);