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

Merge branch 'for-davem' of... 

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
parents 791f58c0 5c01d566

Documentation/feature-removal-schedule.txt

+21 −1
Original line number Diff line number Diff line
@@ -520,7 +520,6 @@ Who: Hans de Goede <hdegoede@redhat.com> 


----------------------------





What:	corgikbd, spitzkbd, tosakbd driver

When:	2.6.35

Files:	drivers/input/keyboard/{corgi,spitz,tosa}kbd.c
@@ -608,3 +607,24 @@ Why: Useful in 2003, implementation is a hack. 
	Generally invoked by accident today.

	Seen as doing more harm than good.

Who:	Len Brown <len.brown@intel.com>



----------------------------



What:	iwlwifi 50XX module parameters

When:	2.6.40

Why:	The "..50" modules parameters were used to configure 5000 series and

	up devices; different set of module parameters also available for 4965

	with same functionalities. Consolidate both set into single place

	in drivers/net/wireless/iwlwifi/iwl-agn.c



Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>



----------------------------



What:	iwl4965 alias support

When:	2.6.40

Why:	Internal alias support has been present in module-init-tools for some

	time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed

	with no impact.



Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>

drivers/net/wireless/ath/ar9170/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -425,5 +425,6 @@ enum ar9170_txq { 


#define AR9170_TXQ_DEPTH	32

#define AR9170_TX_MAX_PENDING	128

#define AR9170_RX_STREAM_MAX_SIZE 65535



#endif /* __AR9170_HW_H */

drivers/net/wireless/ath/ar9170/main.c

+7 −6
Original line number Diff line number Diff line
@@ -689,7 +689,8 @@ void ar9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len) 


	/* firmware debug */

	case 0xca:

		printk(KERN_DEBUG "ar9170 FW: %.*s\n", len - 4, (char *)buf + 4);

		printk(KERN_DEBUG "ar9170 FW: %.*s\n", len - 4,

				(char *)buf + 4);

		break;

	case 0xcb:

		len -= 4;
@@ -2512,7 +2513,7 @@ void *ar9170_alloc(size_t priv_size) 
	 * tends to split the streams into separate rx descriptors.

	 */



	skb = __dev_alloc_skb(AR9170_MAX_RX_BUFFER_SIZE, GFP_KERNEL);

	skb = __dev_alloc_skb(AR9170_RX_STREAM_MAX_SIZE, GFP_KERNEL);

	if (!skb)

		goto err_nomem;

drivers/net/wireless/ath/ar9170/usb.c

+10 −0
Original line number Diff line number Diff line
@@ -67,18 +67,28 @@ static struct usb_device_id ar9170_usb_ids[] = { 
	{ USB_DEVICE(0x0cf3, 0x1001) },

	/* TP-Link TL-WN821N v2 */

	{ USB_DEVICE(0x0cf3, 0x1002) },

	/* 3Com Dual Band 802.11n USB Adapter */

	{ USB_DEVICE(0x0cf3, 0x1010) },

	/* H3C Dual Band 802.11n USB Adapter */

	{ USB_DEVICE(0x0cf3, 0x1011) },

	/* Cace Airpcap NX */

	{ USB_DEVICE(0xcace, 0x0300) },

	/* D-Link DWA 160 A1 */

	{ USB_DEVICE(0x07d1, 0x3c10) },

	/* D-Link DWA 160 A2 */

	{ USB_DEVICE(0x07d1, 0x3a09) },

	/* Netgear WNA1000 */

	{ USB_DEVICE(0x0846, 0x9040) },

	/* Netgear WNDA3100 */

	{ USB_DEVICE(0x0846, 0x9010) },

	/* Netgear WN111 v2 */

	{ USB_DEVICE(0x0846, 0x9001) },

	/* Zydas ZD1221 */

	{ USB_DEVICE(0x0ace, 0x1221) },

	/* Proxim ORiNOCO 802.11n USB */

	{ USB_DEVICE(0x1435, 0x0804) },

	/* WNC Generic 11n USB Dongle */

	{ USB_DEVICE(0x1435, 0x0326) },

	/* ZyXEL NWD271N */

	{ USB_DEVICE(0x0586, 0x3417) },

	/* Z-Com UB81 BG */

drivers/net/wireless/ath/ath.h

+10 −3
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ enum ath_device_state { 
	ATH_HW_INITIALIZED,

};



enum ath_bus_type {

	ATH_PCI,

	ATH_AHB,

	ATH_USB,

};



struct reg_dmn_pair_mapping {

	u16 regDmnEnum;

	u16 reg_5ghz_ctl;
@@ -73,6 +79,7 @@ struct ath_ops { 
struct ath_common;



struct ath_bus_ops {

	enum ath_bus_type ath_bus_type;

	void (*read_cachesize)(struct ath_common *common, int *csz);

	bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);

	void (*bt_coex_prep)(struct ath_common *common);