diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 22:21:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-20 22:21:28 +0200 |
| commit | ed15e8880fc3d8d52bc02a02521054bfcb26264a (patch) | |
| tree | 816a7f35028762976f5d4bc4df172e407c4bcbe2 /drivers/net/macvtap.c | |
| parent | staging: dgap: remove duplicate code (diff) | |
| parent | Linux 4.2-rc3 (diff) | |
| download | linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.tar.xz linux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.zip | |
Merge 4.2-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/macvtap.c')
| -rw-r--r-- | drivers/net/macvtap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index f8370808a018..3b933bb5a8d5 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -1355,6 +1355,7 @@ static void macvtap_exit(void) class_unregister(macvtap_class); cdev_del(&macvtap_cdev); unregister_chrdev_region(macvtap_major, MACVTAP_NUM_DEVS); + idr_destroy(&minor_idr); } module_exit(macvtap_exit); |