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

Commit bb7b2284 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 539054a8 66f84d65

drivers/net/wireless/ipw2x00/ipw2100.c

+1 −4
Original line number Diff line number Diff line
@@ -6325,10 +6325,8 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev, 


      fail:

	if (dev) {

		if (registered) {

			unregister_ieee80211(priv->ieee);

		if (registered)

			unregister_netdev(dev);

		}



		ipw2100_hw_stop_adapter(priv);
@@ -6385,7 +6383,6 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev) 
		/* Unregister the device first - this results in close()

		 * being called if the device is open.  If we free storage

		 * first, then close() will crash. */

		unregister_ieee80211(priv->ieee);

		unregister_netdev(dev);



		/* ipw2100_down will ensure that there is no more pending work

drivers/net/wireless/ipw2x00/ipw2200.c

+0 −2
Original line number Diff line number Diff line
@@ -11821,7 +11821,6 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev, 
		if (err) {

			IPW_ERROR("Failed to register promiscuous network "

				  "device (error %d).\n", err);

			unregister_ieee80211(priv->ieee);

			unregister_netdev(priv->net_dev);

			goto out_remove_sysfs;

		}
@@ -11872,7 +11871,6 @@ static void __devexit ipw_pci_remove(struct pci_dev *pdev) 


	mutex_unlock(&priv->mutex);



	unregister_ieee80211(priv->ieee);

	unregister_netdev(priv->net_dev);



	if (priv->rxq) {

drivers/net/wireless/ipw2x00/libipw.h

+0 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,6 @@ static inline int libipw_is_cck_rate(u8 rate) 
/* ieee80211.c */

extern void free_ieee80211(struct net_device *dev, int monitor);

extern struct net_device *alloc_ieee80211(int sizeof_priv, int monitor);

extern void unregister_ieee80211(struct libipw_device *ieee);

extern int libipw_change_mtu(struct net_device *dev, int new_mtu);



extern void libipw_networks_age(struct libipw_device *ieee,

drivers/net/wireless/ipw2x00/libipw_module.c

+5 −9
Original line number Diff line number Diff line
@@ -235,17 +235,14 @@ void free_ieee80211(struct net_device *dev, int monitor) 
	libipw_networks_free(ieee);



	/* free cfg80211 resources */

	if (!monitor)

		wiphy_free(ieee->wdev.wiphy);



	free_netdev(dev);

}



void unregister_ieee80211(struct libipw_device *ieee)

{

	if (!monitor) {

		wiphy_unregister(ieee->wdev.wiphy);

		kfree(ieee->a_band.channels);

		kfree(ieee->bg_band.channels);

		wiphy_free(ieee->wdev.wiphy);

	}



	free_netdev(dev);

}



#ifdef CONFIG_LIBIPW_DEBUG
@@ -333,4 +330,3 @@ module_init(libipw_init); 


EXPORT_SYMBOL(alloc_ieee80211);

EXPORT_SYMBOL(free_ieee80211);
 
EXPORT_SYMBOL(unregister_ieee80211);

drivers/net/wireless/rt2x00/rt2x00dev.c

+2 −2
Original line number Diff line number Diff line
@@ -815,6 +815,8 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 


	mutex_init(&rt2x00dev->csr_mutex);



	set_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);



	/*

	 * Make room for rt2x00_intf inside the per-interface

	 * structure ieee80211_vif.
@@ -871,8 +873,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
	rt2x00leds_register(rt2x00dev);

	rt2x00debug_register(rt2x00dev);



	set_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);



	return 0;



exit: