diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-05-10 16:29:24 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-05-10 16:29:24 +0200 |
| commit | 4f81d715b90b7ebe049dd906511c47956086ad44 (patch) | |
| tree | 80810bd165359e940a30ac4852f95a628bbb1610 /drivers/net/wireless/mwifiex/cfg80211.c | |
| parent | Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | mwifiex: fix setting of multicast filter (diff) | |
| download | linux-4f81d715b90b7ebe049dd906511c47956086ad44.tar.xz linux-4f81d715b90b7ebe049dd906511c47956086ad44.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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; |