diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-27 13:30:49 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-27 13:30:49 +0200 |
| commit | 09e1a79ac03d643960c96314d20a904b39b89a80 (patch) | |
| tree | 8fe7d740f4e8d08a4159a710dd5c6cdc15a85c16 /drivers/net/wireless/mwifiex/cfg80211.c | |
| parent | 071d4990fd9fe6fe27b47f1587ba11db3111c3fd (diff) | |
| parent | a87783699b23395c46bbeeb5d28f6db24897bf26 (diff) | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
Conflicts:
drivers/net/wireless/iwlwifi/mvm/ops.c
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 d3c8ece980d8..e42b266a023a 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -2234,9 +2234,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; |