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

Commit b67afe7f authored by John W. Linville's avatar John W. Linville
Browse files

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 

Conflicts:
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
parents db28569a 28bec7b8

drivers/bluetooth/ath3k.c

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ static struct usb_device_id ath3k_table[] = { 
	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3004) },



	/* 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
@@ -108,6 +108,9 @@ static struct usb_device_id blacklist_table[] = { 
	/* Atheros 3012 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3004), .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 },
@@ -828,7 +831,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);
@@ -857,7 +860,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

+1 −0
Original line number Diff line number Diff line
@@ -1281,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;

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

+1 −7
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))
@@ -218,6 +215,7 @@ struct ath_frame_info { 
struct ath_buf_state {

	u8 bf_type;

	u8 bfs_paprd;

	unsigned long bfs_paprd_timestamp;

	enum ath9k_internal_frame_type bfs_ftype;

};
@@ -602,7 +600,6 @@ struct ath_softc { 
	struct work_struct paprd_work;

	struct work_struct hw_check_work;

	struct completion paprd_complete;

	bool paprd_pending;



	unsigned int hw_busy_count;
@@ -649,8 +646,6 @@ struct ath_softc { 
	struct ath_descdma txsdma;



	struct ath_ant_comb ant_comb;



	struct pm_qos_request_list pm_qos_req;

};



void ath9k_tasklet(unsigned long data);
@@ -665,7 +660,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 */
@@ -760,9 +756,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:
@@ -819,7 +812,6 @@ void ath9k_deinit_device(struct ath_softc *sc) 
	ath9k_ps_restore(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);