]> git.baikalelectronics.ru Git - kernel.git/commit
staging: wilc1000: remove conditional lock in wilc_wfi_deinit_mon_interface()
authorAjay Singh <ajay.kathat@microchip.com>
Sat, 2 Feb 2019 19:16:56 +0000 (19:16 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Feb 2019 11:38:40 +0000 (12:38 +0100)
commit08a64361a308e28070c5f5f0c29bc82c948b0447
treee48155db13ee56796ee1b63f98bc486bb2a6dc3a
parentc2b4a389ba6200ca6c9e56042bcf72f286b48d0f
staging: wilc1000: remove conditional lock in wilc_wfi_deinit_mon_interface()

wilc_wfi_deinit_mon_interface() calls unregister_netdev() which
requires the rtnl lock again. Now move wilc_wfi_deinit_mon_interface()
out of wilc_mac_close(). Also remove explicit call to wilc_mac_close()
because unregister_netdev() takes care of calling wilc_mac_close().

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_mon.c
drivers/staging/wilc1000/linux_wlan.c