diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-10-29 17:43:55 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 20:31:30 (GMT) |
| commit | 14e5300631fa504058315cc74da66ce18ed41e11 (patch) | |
| tree | f221c36d3959ef943559accf13898aa2d823e69d /drivers/staging/vt6655 | |
| parent | 1d6d3c1a62012653df86979658db3b86ef94b63b (diff) | |
| download | linux-14e5300631fa504058315cc74da66ce18ed41e11.tar.xz | |
staging: vt6655: mac80211 conversion: device_free_info
Remove net device code and add mac80211 unregister code.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 77d81b3..451b608 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -806,31 +806,20 @@ static bool device_get_pci_info(struct vnt_private *pDevice, static void device_free_info(struct vnt_private *pDevice) { - struct net_device *dev = pDevice->dev; - - ASSERT(pDevice); -//2008-0714-01<Add>by chester - device_release_WPADEV(pDevice); - -//2008-07-21-01<Add>by MikeLiu -//unregister wpadev - if (wpa_set_wpadev(pDevice, 0) != 0) - pr_err("unregister wpadev fail?\n"); + if (!pDevice) + return; -#ifdef HOSTAP - if (dev) - vt6655_hostap_set_hostapd(pDevice, 0, 0); -#endif - if (dev) - unregister_netdev(dev); + if (pDevice->mac_hw) + ieee80211_unregister_hw(pDevice->hw); if (pDevice->PortOffset) iounmap(pDevice->PortOffset); if (pDevice->pcid) pci_release_regions(pDevice->pcid); - if (dev) - free_netdev(dev); + + if (pDevice->hw) + ieee80211_free_hw(pDevice->hw); } static bool device_init_rings(struct vnt_private *pDevice) |