Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14e53006 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: mac80211 conversion: device_free_info 



Remove net device code and add mac80211 unregister code.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d6d3c1a

drivers/staging/vt6655/device_main.c

+7 −18
Original line number Diff line number Diff line
@@ -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)