diff options
author | 2020-07-27 12:42:15 +0200 | |
---|---|---|
committer | 2020-07-27 12:42:15 +0200 | |
commit | 908e757daecf2120c3019fa630ae5d4c3cd7165b (patch) | |
tree | 652b0f3ecd4a6d7c0066169d6ae466711300197c /net/core/rtnetlink.c | |
parent | staging: comedi: addi: Replace HTTP links with HTTPS ones (diff) | |
parent | Linux 5.8-rc7 (diff) | |
download | linux-dev-908e757daecf2120c3019fa630ae5d4c3cd7165b.tar.xz linux-dev-908e757daecf2120c3019fa630ae5d4c3cd7165b.zip |
Merge 5.8-rc7 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/rtnetlink.c')
-rw-r--r-- | net/core/rtnetlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 9aedc15736ad..85a4b0101f76 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3343,7 +3343,8 @@ replay: */ if (err < 0) { /* If device is not registered at all, free it now */ - if (dev->reg_state == NETREG_UNINITIALIZED) + if (dev->reg_state == NETREG_UNINITIALIZED || + dev->reg_state == NETREG_UNREGISTERED) free_netdev(dev); goto out; } |