OSDN Git Service

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)
commit06fee3d5b3c3a57ab2bd91b0e032510a1e58c612
treee48155db13ee56796ee1b63f98bc486bb2a6dc3a
parent588713006ea49d63d4e01aa147e9e3dcb130c783
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