diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2013-08-01 06:50:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-01 19:32:05 -0400 |
commit | 787381415cf967c5d6d1d7c5b5bd893376945edd (patch) | |
tree | 6a087dbe3875655ef89276f5c20487ee90115922 /drivers/net/macvlan.c | |
parent | 266e83474c98e9f18d31f4837cfe05819a660d32 (diff) |
macvlan: handle set_promiscuity failures
It's quite unlikely that dev_set_promiscuity will fail,
but worth checking just in case.
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r-- | drivers/net/macvlan.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 13937f9c04ad..d0f9c2fd1d4f 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
@@ -337,8 +337,11 @@ static int macvlan_open(struct net_device *dev) | |||
337 | int err; | 337 | int err; |
338 | 338 | ||
339 | if (vlan->port->passthru) { | 339 | if (vlan->port->passthru) { |
340 | if (!(vlan->flags & MACVLAN_FLAG_NOPROMISC)) | 340 | if (!(vlan->flags & MACVLAN_FLAG_NOPROMISC)) { |
341 | dev_set_promiscuity(lowerdev, 1); | 341 | err = dev_set_promiscuity(lowerdev, 1); |
342 | if (err < 0) | ||
343 | goto out; | ||
344 | } | ||
342 | goto hash_add; | 345 | goto hash_add; |
343 | } | 346 | } |
344 | 347 | ||