diff options
| author | Gilad Ben-Yossef <[email protected]> | 2015-06-25 16:50:13 +0300 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-06-28 16:57:08 -0700 |
| commit | 4fdeddfe04d0d0fdd4cc57bc25a02adf40dbb60a (patch) | |
| tree | 29941982bdd6f540e4a0dd44536008b786b99abc | |
| parent | 14e28b1d3cdb8cb877be45c73b70c2ae8a77e14d (diff) | |
dsa: fix promiscuity leak on slave dev open error
DSA master netdev promiscuity counter was not being properly
decremented on slave device open error path.
Signed-off-by: Gilad Ben-Yossef <[email protected]>
CC: Gilad Ben-Yossef <[email protected]>
CC: David S. Miller <[email protected]>
CC: Florian Fainelli <[email protected]>
CC: Guenter Roeck <[email protected]>
CC: Andrew Lunn <[email protected]>
CC: Scott Feldman <[email protected]>
Acked-by: Andrew Lunn <[email protected]>
Acked-by: Florian Fainelli <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | net/dsa/slave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 04ffad311704..0917123790ea 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -112,7 +112,7 @@ static int dsa_slave_open(struct net_device *dev) clear_promisc: if (dev->flags & IFF_PROMISC) - dev_set_promiscuity(master, 0); + dev_set_promiscuity(master, -1); clear_allmulti: if (dev->flags & IFF_ALLMULTI) dev_set_allmulti(master, -1); |