diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-05-29 14:50:45 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-05-29 14:50:45 -0400 |
| commit | 531efffc3e3ff52d732c8fa6f32e084e9c447612 (patch) | |
| tree | 79c301b2c8b5400a39c95e034764cf7a208a16a2 /drivers/net/wireless/mwifiex/cfg80211.c | |
| parent | bbf71a8f35cf52e97ba129401f82ccefd249c757 (diff) | |
| parent | b571a69745dc90aec3d0505a7ceac2702a93861b (diff) | |
| download | linux-531efffc3e3ff52d732c8fa6f32e084e9c447612.tar.gz linux-531efffc3e3ff52d732c8fa6f32e084e9c447612.tar.bz2 linux-531efffc3e3ff52d732c8fa6f32e084e9c447612.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/mwifiex/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index af79daa331d0..00a82817eb6b 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -2282,9 +2282,6 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) if (wdev->netdev->reg_state == NETREG_REGISTERED) unregister_netdevice(wdev->netdev); - if (wdev->netdev->reg_state == NETREG_UNREGISTERED) - free_netdev(wdev->netdev); - /* Clear the priv in adapter */ priv->netdev = NULL; |