Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (07bfa524) · Commits · e / devices / android_kernel_fairphone_FP3

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)
		int addr, eep_start_loc;
		eep_data = (u16 *)eep;

		if (ah->hw_version.devid == 0x7015)
		if (AR9287_HTC_DEVID(ah))
		eep_start_loc = AR9287_HTC_EEP_START_LOC;
		else
		eep_start_loc = AR9287_EEP_START_LOC;

+9 −0

Original line number	Diff line number	Diff line
		@@ -36,8 +36,13 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
		{ USB_DEVICE(0x13D3, 0x3327) }, /* Azurewave */
		{ USB_DEVICE(0x13D3, 0x3328) }, /* Azurewave */
		{ USB_DEVICE(0x13D3, 0x3346) }, /* IMC Networks */
		{ USB_DEVICE(0x13D3, 0x3348) }, /* Azurewave */
		{ USB_DEVICE(0x13D3, 0x3349) }, /* Azurewave */
		{ USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
		{ USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
		{ USB_DEVICE(0x083A, 0xA704) }, /* SMC Networks */
		{ USB_DEVICE(0x040D, 0x3801) }, /* VIA */
		{ USB_DEVICE(0x1668, 0x1200) }, /* Verizon */
		{ },
		};

		@@ -806,6 +811,8 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
		case 0x7010:
		case 0x7015:
		case 0x9018:
		case 0xA704:
		case 0x1200:
		firm_offset = AR7010_FIRMWARE_TEXT;
		break;
		default:
		@@ -928,6 +935,8 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
		case 0x7010:
		case 0x7015:
		case 0x9018:
		case 0xA704:
		case 0x1200:
		if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
		hif_dev->fw_name = FIRMWARE_AR7010_1_1;
		else

+2 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,8 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid)
		case 0x7010:
		case 0x7015:
		case 0x9018:
		case 0xA704:
		case 0x1200:
		priv->htc->credits = 45;
		break;
		default:

+1 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv priv, struct sk_buff skb)
		tx_hdr.data_type = ATH9K_HTC_NORMAL;
		}

		if (ieee80211_is_data(fc)) {
		if (ieee80211_is_data_qos(fc)) {
		qc = ieee80211_get_qos_ctl(hdr);
		tx_hdr.tidno = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -817,8 +817,6 @@ void ath9k_deinit_device(struct ath_softc *sc)

		ath9k_ps_wakeup(sc);

		pm_qos_remove_request(&ath9k_pm_qos_req);

		wiphy_rfkill_stop_polling(sc->hw->wiphy);
		ath_deinit_leds(sc);

		@@ -832,6 +830,7 @@ void ath9k_deinit_device(struct ath_softc *sc)
		}

		ieee80211_unregister_hw(hw);
		pm_qos_remove_request(&ath9k_pm_qos_req);
		ath_rx_cleanup(sc);
		ath_tx_cleanup(sc);
		ath9k_deinit_softc(sc);