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

MAINTAINERS

+1 −4

Original line number	Diff line number	Diff line
		@@ -2966,7 +2966,6 @@ F: drivers/net/ixgb/
		F: drivers/net/ixgbe/

		INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
		M: Zhu Yi <yi.zhu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		@@ -2976,7 +2975,6 @@ F: Documentation/networking/README.ipw2100
		F: drivers/net/wireless/ipw2x00/ipw2100.*

		INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
		M: Zhu Yi <yi.zhu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		@@ -3007,8 +3005,8 @@ F: drivers/net/wimax/i2400m/
		F: include/linux/wimax/i2400m.h

		INTEL WIRELESS WIFI LINK (iwlwifi)
		M: Zhu Yi <yi.zhu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		W: http://intellinuxwireless.org
		@@ -3018,7 +3016,6 @@ F: drivers/net/wireless/iwlwifi/

		INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
		M: Samuel Ortiz <samuel.ortiz@intel.com>
		M: Zhu Yi <yi.zhu@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		S: Supported

drivers/net/wireless/ath/ath5k/base.c

+10 −19

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ static const struct ieee80211_rate ath5k_rates[] = {
		static int __devinit ath5k_pci_probe(struct pci_dev *pdev,
		const struct pci_device_id *id);
		static void __devexit ath5k_pci_remove(struct pci_dev *pdev);
		#ifdef CONFIG_PM
		#ifdef CONFIG_PM_SLEEP
		static int ath5k_pci_suspend(struct device *dev);
		static int ath5k_pci_resume(struct device *dev);

		@@ -203,7 +203,7 @@ static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume);
		#define ATH5K_PM_OPS (&ath5k_pm_ops)
		#else
		#define ATH5K_PM_OPS NULL
		#endif /* CONFIG_PM */
		#endif /* CONFIG_PM_SLEEP */

		static struct pci_driver ath5k_pci_driver = {
		.name = KBUILD_MODNAME,
		@@ -222,7 +222,6 @@ static int ath5k_tx(struct ieee80211_hw hw, struct sk_buff skb);
		static int ath5k_tx_queue(struct ieee80211_hw hw, struct sk_buff skb,
		struct ath5k_txq *txq);
		static int ath5k_reset(struct ath5k_softc sc, struct ieee80211_channel chan);
		static int ath5k_reset_wake(struct ath5k_softc *sc);
		static int ath5k_start(struct ieee80211_hw *hw);
		static void ath5k_stop(struct ieee80211_hw *hw);
		static int ath5k_add_interface(struct ieee80211_hw *hw,
		@@ -708,7 +707,7 @@ ath5k_pci_remove(struct pci_dev *pdev)
		ieee80211_free_hw(sc->hw);
		}

		#ifdef CONFIG_PM
		#ifdef CONFIG_PM_SLEEP
		static int ath5k_pci_suspend(struct device *dev)
		{
		struct ath5k_softc *sc = pci_get_drvdata(to_pci_dev(dev));
		@@ -732,7 +731,7 @@ static int ath5k_pci_resume(struct device *dev)
		ath5k_led_enable(sc);
		return 0;
		}
		#endif /* CONFIG_PM */
		#endif /* CONFIG_PM_SLEEP */


		/***********************\
		@@ -2770,7 +2769,7 @@ ath5k_tasklet_reset(unsigned long data)
		{
		struct ath5k_softc sc = (void )data;

		ath5k_reset_wake(sc);
		ath5k_reset(sc, sc->curchan);
		}

		/*
		@@ -2949,20 +2948,10 @@ ath5k_reset(struct ath5k_softc sc, struct ieee80211_channel chan)
		ath5k_beacon_config(sc);
		/* intrs are enabled by ath5k_beacon_config */

		return 0;
		err:
		return ret;
		}

		static int
		ath5k_reset_wake(struct ath5k_softc *sc)
		{
		int ret;

		ret = ath5k_reset(sc, sc->curchan);
		if (!ret)
		ieee80211_wake_queues(sc->hw);

		return 0;
		err:
		return ret;
		}

		@@ -3159,13 +3148,15 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,

		if (changed_flags & (FIF_PROMISC_IN_BSS \| FIF_OTHER_BSS)) {
		if (*new_flags & FIF_PROMISC_IN_BSS) {
		rfilt \|= AR5K_RX_FILTER_PROM;
		__set_bit(ATH_STAT_PROMISC, sc->status);
		} else {
		__clear_bit(ATH_STAT_PROMISC, sc->status);
		}
		}

		if (test_bit(ATH_STAT_PROMISC, sc->status))
		rfilt \|= AR5K_RX_FILTER_PROM;

		/* Note, AR5K_RX_FILTER_MCAST is already enabled */
		if (*new_flags & FIF_ALLMULTI) {
		mfilt[0] = ~0;

drivers/net/wireless/ath/ath5k/phy.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1793,6 +1793,13 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)
		u8 def_ant, tx_ant, ee_mode;
		u32 sta_id1 = 0;

		/* if channel is not initialized yet we can't set the antennas
		* so just store the mode. it will be set on the next reset */
		if (channel == NULL) {
		ah->ah_ant_mode = ant_mode;
		return;
		}

		def_ant = ah->ah_def_ant;

		switch (channel->hw_value & CHANNEL_MODES) {

drivers/net/wireless/hostap/hostap_hw.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -2618,15 +2618,6 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)
		int events = 0;
		u16 ev;

		/* Detect early interrupt before driver is fully configued */
		if (!dev->base_addr) {
		if (net_ratelimit()) {
		printk(KERN_DEBUG "%s: Interrupt, but dev not configured\n",
		dev->name);
		}
		return IRQ_HANDLED;
		}

		iface = netdev_priv(dev);
		local = iface->local;

drivers/net/wireless/iwlwifi/iwl-3945.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2699,6 +2699,7 @@ static struct iwl_lib_ops iwl3945_lib = {
		.isr = iwl_isr_legacy,
		.config_ap = iwl3945_config_ap,
		.manage_ibss_station = iwl3945_manage_ibss_station,
		.recover_from_tx_stall = iwl_bg_monitor_recover,
		.check_plcp_health = iwl3945_good_plcp_health,

		.debugfs_ops = {