Merge branch 'master' of... (812e4daf) · Commits · e / devices / android_kernel_samsung_universal8895

MAINTAINERS

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7277,7 +7277,6 @@ F: drivers/video/aty/aty128fb.c
	RALINK RT2X00 WIRELESS LAN DRIVER		RALINK RT2X00 WIRELESS LAN DRIVER
	P: rt2x00 project		P: rt2x00 project
	M: Ivo van Doorn <IvDoorn@gmail.com>		M: Ivo van Doorn <IvDoorn@gmail.com>
	M: Gertjan van Wingerde <gwingerde@gmail.com>
	M: Helmut Schaa <helmut.schaa@googlemail.com>		M: Helmut Schaa <helmut.schaa@googlemail.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	L: users@rt2x00.serialmonkey.com (moderated for non-subscribers)		L: users@rt2x00.serialmonkey.com (moderated for non-subscribers)

drivers/bluetooth/ath3k.c

+2 −0

drivers/bluetooth/btusb.c

+2 −3

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,6 @@ static int ath_ahb_probe(struct platform_device *pdev)
	int irq;		int irq;
	int ret = 0;		int ret = 0;
	struct ath_hw *ah;		struct ath_hw *ah;
	struct ath_common *common;
	char hw_name[64];		char hw_name[64];

	if (!dev_get_platdata(&pdev->dev)) {		if (!dev_get_platdata(&pdev->dev)) {
	@@ -146,9 +145,6 @@ static int ath_ahb_probe(struct platform_device *pdev)
	wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",		wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",
	hw_name, (unsigned long)mem, irq);		hw_name, (unsigned long)mem, irq);

	common = ath9k_hw_common(sc->sc_ah);
	/* Will be cleared in ath9k_start() */
	set_bit(ATH_OP_INVALID, &common->op_flags);
	return 0;		return 0;

	err_irq:		err_irq:

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -155,6 +155,9 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel,
	ATH9K_ANI_RSSI_THR_LOW,		ATH9K_ANI_RSSI_THR_LOW,
	ATH9K_ANI_RSSI_THR_HIGH);		ATH9K_ANI_RSSI_THR_HIGH);

			if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_OFDM_DEF_LEVEL)
			immunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;

	if (!scan)		if (!scan)
	aniState->ofdmNoiseImmunityLevel = immunityLevel;		aniState->ofdmNoiseImmunityLevel = immunityLevel;

	@@ -235,6 +238,9 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel,
	BEACON_RSSI(ah), ATH9K_ANI_RSSI_THR_LOW,		BEACON_RSSI(ah), ATH9K_ANI_RSSI_THR_LOW,
	ATH9K_ANI_RSSI_THR_HIGH);		ATH9K_ANI_RSSI_THR_HIGH);

			if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_CCK_DEF_LEVEL)
			immunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;

	if (ah->opmode == NL80211_IFTYPE_STATION &&		if (ah->opmode == NL80211_IFTYPE_STATION &&
	BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW &&		BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW &&
	immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)		immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)

Original line number	Original line	Diff line number	Diff line
	@@ -82,6 +82,7 @@ static const struct usb_device_id ath3k_table[] = {
	{ USB_DEVICE(0x04CA, 0x3004) },		{ USB_DEVICE(0x04CA, 0x3004) },
	{ USB_DEVICE(0x04CA, 0x3005) },		{ USB_DEVICE(0x04CA, 0x3005) },
	{ USB_DEVICE(0x04CA, 0x3006) },		{ USB_DEVICE(0x04CA, 0x3006) },
			{ USB_DEVICE(0x04CA, 0x3007) },
	{ USB_DEVICE(0x04CA, 0x3008) },		{ USB_DEVICE(0x04CA, 0x3008) },
	{ USB_DEVICE(0x04CA, 0x300b) },		{ USB_DEVICE(0x04CA, 0x300b) },
	{ USB_DEVICE(0x0930, 0x0219) },		{ USB_DEVICE(0x0930, 0x0219) },
	@@ -131,6 +132,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = {
	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

Original line number	Original line	Diff line number	Diff line
	@@ -152,6 +152,7 @@ static const struct usb_device_id blacklist_table[] = {
	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
	@@ -1485,10 +1486,8 @@ static int btusb_probe(struct usb_interface *intf,
	if (id->driver_info & BTUSB_BCM92035)		if (id->driver_info & BTUSB_BCM92035)
	hdev->setup = btusb_setup_bcm92035;		hdev->setup = btusb_setup_bcm92035;

	if (id->driver_info & BTUSB_INTEL) {		if (id->driver_info & BTUSB_INTEL)
	usb_enable_autosuspend(data->udev);
	hdev->setup = btusb_setup_intel;		hdev->setup = btusb_setup_intel;
	}

	/* Interface numbers are hardcoded in the specification */		/* Interface numbers are hardcoded in the specification */
	data->isoc = usb_ifnum_to_if(data->udev, 1);		data->isoc = usb_ifnum_to_if(data->udev, 1);