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

Commit d3bd1b4c 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 28801f35 0bf719df

drivers/bluetooth/ath3k.c

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ static struct usb_device_id ath3k_table[] = { 


	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },

	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+5 −2
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ static struct usb_device_id blacklist_table[] = { 
	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
@@ -829,7 +832,7 @@ static void btusb_work(struct work_struct *work) 


	if (hdev->conn_hash.sco_num > 0) {

		if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {

			err = usb_autopm_get_interface(data->isoc);

			err = usb_autopm_get_interface(data->isoc ? data->isoc : data->intf);

			if (err < 0) {

				clear_bit(BTUSB_ISOC_RUNNING, &data->flags);

				usb_kill_anchored_urbs(&data->isoc_anchor);
@@ -858,7 +861,7 @@ static void btusb_work(struct work_struct *work) 


		__set_isoc_interface(hdev, 0);

		if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags))

			usb_autopm_put_interface(data->isoc);

			usb_autopm_put_interface(data->isoc ? data->isoc : data->intf);

	}

}

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

+88 −55
Original line number Diff line number Diff line
@@ -282,6 +282,34 @@ int ath5k_hw_phy_disable(struct ath5k_hw *ah) 
	return 0;

}



/*

 * Wait for synth to settle

 */

static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,

			struct ieee80211_channel *channel)

{

	/*

	 * On 5211+ read activation -> rx delay

	 * and use it (100ns steps).

	 */

	if (ah->ah_version != AR5K_AR5210) {

		u32 delay;

		delay = ath5k_hw_reg_read(ah, AR5K_PHY_RX_DELAY) &

			AR5K_PHY_RX_DELAY_M;

		delay = (channel->hw_value & CHANNEL_CCK) ?

			((delay << 2) / 22) : (delay / 10);

		if (ah->ah_bwmode == AR5K_BWMODE_10MHZ)

			delay = delay << 1;

		if (ah->ah_bwmode == AR5K_BWMODE_5MHZ)

			delay = delay << 2;

		/* XXX: /2 on turbo ? Let's be safe

		 * for now */

		udelay(100 + delay);

	} else {

		mdelay(1);

	}

}





/**********************\

* RF Gain optimization *
@@ -1253,6 +1281,7 @@ static int ath5k_hw_channel(struct ath5k_hw *ah, 
	case AR5K_RF5111:

		ret = ath5k_hw_rf5111_channel(ah, channel);

		break;

	case AR5K_RF2317:

	case AR5K_RF2425:

		ret = ath5k_hw_rf2425_channel(ah, channel);

		break;
@@ -3237,6 +3266,13 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
		/* Failed */

		if (i >= 100)

			return -EIO;



		/* Set channel and wait for synth */

		ret = ath5k_hw_channel(ah, channel);

		if (ret)

			return ret;



		ath5k_hw_wait_for_synth(ah, channel);

	}



	/*
@@ -3251,13 +3287,53 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
	if (ret)

		return ret;



	/* Write OFDM timings on 5212*/

	if (ah->ah_version == AR5K_AR5212 &&

		channel->hw_value & CHANNEL_OFDM) {



		ret = ath5k_hw_write_ofdm_timings(ah, channel);

		if (ret)

			return ret;



		/* Spur info is available only from EEPROM versions

		 * greater than 5.3, but the EEPROM routines will use

		 * static values for older versions */

		if (ah->ah_mac_srev >= AR5K_SREV_AR5424)

			ath5k_hw_set_spur_mitigation_filter(ah,

							    channel);

	}



	/* If we used fast channel switching

	 * we are done, release RF bus and

	 * fire up NF calibration.

	 *

	 * Note: Only NF calibration due to

	 * channel change, not AGC calibration

	 * since AGC is still running !

	 */

	if (fast) {

		/*

		 * Release RF Bus grant

		 */

		AR5K_REG_DISABLE_BITS(ah, AR5K_PHY_RFBUS_REQ,

				    AR5K_PHY_RFBUS_REQ_REQUEST);



		/*

		 * Start NF calibration

		 */

		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,

					AR5K_PHY_AGCCTL_NF);



		return ret;

	}



	/*

	 * For 5210 we do all initialization using

	 * initvals, so we don't have to modify

	 * any settings (5210 also only supports

	 * a/aturbo modes)

	 */

	if ((ah->ah_version != AR5K_AR5210) && !fast) {

	if (ah->ah_version != AR5K_AR5210) {



		/*

		 * Write initial RF gain settings
@@ -3276,22 +3352,6 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
		if (ret)

			return ret;



		/* Write OFDM timings on 5212*/

		if (ah->ah_version == AR5K_AR5212 &&

			channel->hw_value & CHANNEL_OFDM) {



			ret = ath5k_hw_write_ofdm_timings(ah, channel);

			if (ret)

				return ret;



			/* Spur info is available only from EEPROM versions

			 * greater than 5.3, but the EEPROM routines will use

			 * static values for older versions */

			if (ah->ah_mac_srev >= AR5K_SREV_AR5424)

				ath5k_hw_set_spur_mitigation_filter(ah,

								    channel);

		}



		/*Enable/disable 802.11b mode on 5111

		(enable 2111 frequency converter + CCK)*/

		if (ah->ah_radio == AR5K_RF5111) {
@@ -3322,34 +3382,8 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
	 */

	ath5k_hw_reg_write(ah, AR5K_PHY_ACT_ENABLE, AR5K_PHY_ACT);



	/*

	 * On 5211+ read activation -> rx delay

	 * and use it.

	 */

	if (ah->ah_version != AR5K_AR5210) {

		u32 delay;

		delay = ath5k_hw_reg_read(ah, AR5K_PHY_RX_DELAY) &

			AR5K_PHY_RX_DELAY_M;

		delay = (channel->hw_value & CHANNEL_CCK) ?

			((delay << 2) / 22) : (delay / 10);

		if (ah->ah_bwmode == AR5K_BWMODE_10MHZ)

			delay = delay << 1;

		if (ah->ah_bwmode == AR5K_BWMODE_5MHZ)

			delay = delay << 2;

		/* XXX: /2 on turbo ? Let's be safe

		 * for now */

		udelay(100 + delay);

	} else {

		mdelay(1);

	}

	ath5k_hw_wait_for_synth(ah, channel);



	if (fast)

		/*

		 * Release RF Bus grant

		 */

		AR5K_REG_DISABLE_BITS(ah, AR5K_PHY_RFBUS_REQ,

				    AR5K_PHY_RFBUS_REQ_REQUEST);

	else {

	/*

	 * Perform ADC test to see if baseband is ready

	 * Set tx hold and check adc test register
@@ -3362,7 +3396,6 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
		udelay(200);

	}

	ath5k_hw_reg_write(ah, phy_tst1, AR5K_PHY_TST1);

	}



	/*

	 * Start automatic gain control calibration

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/device.h>

#include <linux/leds.h>

#include <linux/completion.h>

#include <linux/pm_qos_params.h>



#include "debug.h"

#include "common.h"
@@ -57,8 +56,6 @@ struct ath_node; 


#define A_MAX(a, b) ((a) > (b) ? (a) : (b))



#define ATH9K_PM_QOS_DEFAULT_VALUE	55



#define TSF_TO_TU(_h,_l) \

	((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))
@@ -633,8 +630,6 @@ struct ath_softc { 
	struct ath_descdma txsdma;



	struct ath_ant_comb ant_comb;



	struct pm_qos_request_list pm_qos_req;

};



struct ath_wiphy {
@@ -666,7 +661,6 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz) 
extern struct ieee80211_ops ath9k_ops;

extern int ath9k_modparam_nohwcrypt;

extern int led_blink;

extern int ath9k_pm_qos_value;

extern bool is_ath9k_unloaded;



irqreturn_t ath_isr(int irq, void *dev);

drivers/net/wireless/ath/ath9k/init.c

+0 −8
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ static int ath9k_btcoex_enable; 
module_param_named(btcoex_enable, ath9k_btcoex_enable, int, 0444);

MODULE_PARM_DESC(btcoex_enable, "Enable wifi-BT coexistence");



int ath9k_pm_qos_value = ATH9K_PM_QOS_DEFAULT_VALUE;

module_param_named(pmqos, ath9k_pm_qos_value, int, S_IRUSR | S_IRGRP | S_IROTH);

MODULE_PARM_DESC(pmqos, "User specified PM-QOS value");



bool is_ath9k_unloaded;

/* We use the hw_value as an index into our private channel structure */
@@ -762,9 +758,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid, 
	ath_init_leds(sc);

	ath_start_rfkill_poll(sc);



	pm_qos_add_request(&sc->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,

			   PM_QOS_DEFAULT_VALUE);



	return 0;



error_world:
@@ -831,7 +824,6 @@ void ath9k_deinit_device(struct ath_softc *sc) 
	}



	ieee80211_unregister_hw(hw);

	pm_qos_remove_request(&sc->pm_qos_req);

	ath_rx_cleanup(sc);

	ath_tx_cleanup(sc);

	ath9k_deinit_softc(sc);