diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-10 10:19:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-10 10:19:28 +0100 |
| commit | d88f1f1fdb9f8f60602b406c89342e113a19df7f (patch) | |
| tree | 16da02010b66f7f54fde737c5c54e43980789f79 /drivers/net/macvlan.c | |
| parent | 04860d48a8aba5b21ae5ba1f86b0d4e3bc628fff (diff) | |
| parent | cdb06e9d8f520c969676e7d6778cffe5894f079f (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes and dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index a0f2be81d52e..8fc02d9db3d0 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -1451,7 +1451,7 @@ destroy_macvlan_port: /* the macvlan port may be freed by macvlan_uninit when fail to register. * so we destroy the macvlan port only when it's valid. */ - if (create && macvlan_port_get_rtnl(dev)) + if (create && macvlan_port_get_rtnl(lowerdev)) macvlan_port_destroy(port->dev); return err; } |