Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 (44dc19c8) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/net/wireless/airo.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2668,6 +2668,7 @@ static struct net_device init_wifidev(struct airo_info ai,
		dev->irq = ethdev->irq;
		dev->base_addr = ethdev->base_addr;
		dev->wireless_data = ethdev->wireless_data;
		SET_NETDEV_DEV(dev, ethdev->dev.parent);
		memcpy(dev->dev_addr, ethdev->dev_addr, dev->addr_len);
		err = register_netdev(dev);
		if (err<0) {
		@@ -2904,7 +2905,7 @@ EXPORT_SYMBOL(init_airo_card);

		static int waitbusy (struct airo_info *ai) {
		int delay = 0;
		while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) & (delay < 10000)) {
		while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) {
		udelay (10);
		if ((++delay % 20) == 0)
		OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY);

drivers/net/wireless/hostap/hostap_hw.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -3276,11 +3276,6 @@ while (0)
		}
		printk(KERN_INFO "%s: Registered netdevice %s\n", dev_info, dev->name);

		#ifndef PRISM2_NO_PROCFS_DEBUG
		create_proc_read_entry("registers", 0, local->proc,
		prism2_registers_proc_read, local);
		#endif /* PRISM2_NO_PROCFS_DEBUG */

		hostap_init_data(local);
		return dev;

		@@ -3307,6 +3302,10 @@ static int hostap_hw_ready(struct net_device *dev)
		netif_carrier_off(local->ddev);
		}
		hostap_init_proc(local);
		#ifndef PRISM2_NO_PROCFS_DEBUG
		create_proc_read_entry("registers", 0, local->proc,
		prism2_registers_proc_read, local);
		#endif /* PRISM2_NO_PROCFS_DEBUG */
		hostap_init_ap_proc(local);
		return 0;
		}

drivers/net/wireless/ipw2200.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -11584,6 +11584,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)
		priv->prom_net_dev->hard_start_xmit = ipw_prom_hard_start_xmit;

		priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
		SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);

		rc = register_netdev(priv->prom_net_dev);
		if (rc) {

drivers/net/wireless/libertas/main.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -756,6 +756,7 @@ static int lbs_thread(void *data)
		priv->nr_retries = 0;
		} else {
		priv->cur_cmd = NULL;
		priv->dnld_sent = DNLD_RES_RECEIVED;
		lbs_pr_info("requeueing command %x due to timeout (#%d)\n",
		le16_to_cpu(cmdnode->cmdbuf->command), priv->nr_retries);

		@@ -1564,6 +1565,7 @@ static int lbs_add_rtap(struct lbs_private *priv)
		rtap_dev->hard_start_xmit = lbs_rtap_hard_start_xmit;
		rtap_dev->set_multicast_list = lbs_set_multicast_list;
		rtap_dev->priv = priv;
		SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent);

		ret = register_netdev(rtap_dev);
		if (ret) {

include/net/mac80211.h

+23 −2

Original line number	Diff line number	Diff line
		@@ -1598,9 +1598,12 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw);
		*
		* This function iterates over the interfaces associated with a given
		* hardware that are currently active and calls the callback for them.
		* This function allows the iterator function to sleep, when the iterator
		* function is atomic @ieee80211_iterate_active_interfaces_atomic can
		* be used.
		*
		* @hw: the hardware struct of which the interfaces should be iterated over
		* @iterator: the iterator function to call, cannot sleep
		* @iterator: the iterator function to call
		* @data: first argument of the iterator function
		*/
		void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
		@@ -1608,6 +1611,24 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif),
		void *data);

		/**
		* ieee80211_iterate_active_interfaces_atomic - iterate active interfaces
		*
		* This function iterates over the interfaces associated with a given
		* hardware that are currently active and calls the callback for them.
		* This function requires the iterator callback function to be atomic,
		* if that is not desired, use @ieee80211_iterate_active_interfaces instead.
		*
		* @hw: the hardware struct of which the interfaces should be iterated over
		* @iterator: the iterator function to call, cannot sleep
		* @data: first argument of the iterator function
		*/
		void ieee80211_iterate_active_interfaces_atomic(struct ieee80211_hw *hw,
		void (iterator)(void data,
		u8 *mac,
		struct ieee80211_vif *vif),
		void *data);

		/**
		* ieee80211_start_tx_ba_session - Start a tx Block Ack session.
		* @hw: pointer as obtained from ieee80211_alloc_hw().