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

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents aaa0c23c 9437a248

drivers/bluetooth/ath3k.c

+4 −0
Original line number Diff line number Diff line
@@ -74,8 +74,10 @@ static struct usb_device_id ath3k_table[] = { 


	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x3008) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x04CA, 0x3004) },

	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x04CA, 0x3006) },

	{ USB_DEVICE(0x04CA, 0x3008) },
@@ -106,8 +108,10 @@ static struct usb_device_id ath3k_blist_tbl[] = { 


	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+2 −0
Original line number Diff line number Diff line
@@ -132,8 +132,10 @@ static struct usb_device_id blacklist_table[] = { 


	/* Atheros 3012 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

drivers/net/wireless/mwifiex/join.c

+3 −4
Original line number Diff line number Diff line
@@ -1117,9 +1117,8 @@ mwifiex_cmd_802_11_ad_hoc_join(struct mwifiex_private *priv, 
		adhoc_join->bss_descriptor.bssid,

		adhoc_join->bss_descriptor.ssid);



	for (i = 0; bss_desc->supported_rates[i] &&

			i < MWIFIEX_SUPPORTED_RATES;

			i++)

	for (i = 0; i < MWIFIEX_SUPPORTED_RATES &&

		    bss_desc->supported_rates[i]; i++)

		;

	rates_size = i;

drivers/net/wireless/rt2x00/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ config RT61PCI 


config RT2800PCI

	tristate "Ralink rt27xx/rt28xx/rt30xx (PCI/PCIe/PCMCIA) support"

	depends on PCI || RALINK_RT288X || RALINK_RT305X

	depends on PCI || SOC_RT288X || SOC_RT305X

	select RT2800_LIB

	select RT2X00_LIB_PCI if PCI

	select RT2X00_LIB_SOC if RALINK_RT288X || RALINK_RT305X

	select RT2X00_LIB_SOC if SOC_RT288X || SOC_RT305X

	select RT2X00_LIB_FIRMWARE

	select RT2X00_LIB_CRYPTO

	select CRC_CCITT

drivers/net/wireless/rt2x00/rt2800pci.c

+7 −7
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token) 
	rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);

}



#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)

#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)

static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)

{

	void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE);
@@ -107,7 +107,7 @@ static inline int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) 
{

	return -ENOMEM;

}

#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */

#endif /* CONFIG_SOC_RT288X || CONFIG_SOC_RT305X */



#ifdef CONFIG_PCI

static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
@@ -1177,7 +1177,7 @@ MODULE_DEVICE_TABLE(pci, rt2800pci_device_table); 
#endif /* CONFIG_PCI */

MODULE_LICENSE("GPL");



#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)

#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)

static int rt2800soc_probe(struct platform_device *pdev)

{

	return rt2x00soc_probe(pdev, &rt2800pci_ops);
@@ -1194,7 +1194,7 @@ static struct platform_driver rt2800soc_driver = { 
	.suspend	= rt2x00soc_suspend,

	.resume		= rt2x00soc_resume,

};

#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */

#endif /* CONFIG_SOC_RT288X || CONFIG_SOC_RT305X */



#ifdef CONFIG_PCI

static int rt2800pci_probe(struct pci_dev *pci_dev,
@@ -1217,7 +1217,7 @@ static int __init rt2800pci_init(void) 
{

	int ret = 0;



#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)

#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)

	ret = platform_driver_register(&rt2800soc_driver);

	if (ret)

		return ret;
@@ -1225,7 +1225,7 @@ static int __init rt2800pci_init(void) 
#ifdef CONFIG_PCI

	ret = pci_register_driver(&rt2800pci_driver);

	if (ret) {

#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)

#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)

		platform_driver_unregister(&rt2800soc_driver);

#endif

		return ret;
@@ -1240,7 +1240,7 @@ static void __exit rt2800pci_exit(void) 
#ifdef CONFIG_PCI

	pci_unregister_driver(&rt2800pci_driver);

#endif

#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)

#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)

	platform_driver_unregister(&rt2800soc_driver);

#endif

}