Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (9d1cd503) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/bluetooth/ath3k.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ static const struct usb_device_id ath3k_table[] = {
		{ USB_DEVICE(0x0CF3, 0xE004) },
		{ USB_DEVICE(0x0CF3, 0xE005) },
		{ USB_DEVICE(0x0930, 0x0219) },
		{ USB_DEVICE(0x0930, 0x0220) },
		{ USB_DEVICE(0x0489, 0xe057) },
		{ USB_DEVICE(0x13d3, 0x3393) },
		{ USB_DEVICE(0x0489, 0xe04e) },
		@@ -132,6 +133,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = {
		{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@ static const struct usb_device_id blacklist_table[] = {
		{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
		{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

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

+43 −9

Original line number	Diff line number	Diff line
		@@ -77,9 +77,16 @@ static bool ar9002_hw_get_isr(struct ath_hw ah, enum ath9k_int masked,
		mask2 \|= ATH9K_INT_CST;
		if (isr2 & AR_ISR_S2_TSFOOR)
		mask2 \|= ATH9K_INT_TSFOOR;

		if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
		REG_WRITE(ah, AR_ISR_S2, isr2);
		isr &= ~AR_ISR_BCNMISC;
		}
		}

		if (pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)
		isr = REG_READ(ah, AR_ISR_RAC);

		if (isr == 0xffffffff) {
		*masked = 0;
		return false;
		@@ -98,11 +105,23 @@ static bool ar9002_hw_get_isr(struct ath_hw ah, enum ath9k_int masked,

		*masked \|= ATH9K_INT_TX;

		if (pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED) {
		s0_s = REG_READ(ah, AR_ISR_S0_S);
		s1_s = REG_READ(ah, AR_ISR_S1_S);
		} else {
		s0_s = REG_READ(ah, AR_ISR_S0);
		REG_WRITE(ah, AR_ISR_S0, s0_s);
		s1_s = REG_READ(ah, AR_ISR_S1);
		REG_WRITE(ah, AR_ISR_S1, s1_s);

		isr &= ~(AR_ISR_TXOK \|
		AR_ISR_TXDESC \|
		AR_ISR_TXERR \|
		AR_ISR_TXEOL);
		}

		ah->intr_txqs \|= MS(s0_s, AR_ISR_S0_QCU_TXOK);
		ah->intr_txqs \|= MS(s0_s, AR_ISR_S0_QCU_TXDESC);

		s1_s = REG_READ(ah, AR_ISR_S1_S);
		ah->intr_txqs \|= MS(s1_s, AR_ISR_S1_QCU_TXERR);
		ah->intr_txqs \|= MS(s1_s, AR_ISR_S1_QCU_TXEOL);
		}
		@@ -115,13 +134,15 @@ static bool ar9002_hw_get_isr(struct ath_hw ah, enum ath9k_int masked,
		*masked \|= mask2;
		}

		if (AR_SREV_9100(ah))
		return true;

		if (isr & AR_ISR_GENTMR) {
		if (!AR_SREV_9100(ah) && (isr & AR_ISR_GENTMR)) {
		u32 s5_s;

		if (pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED) {
		s5_s = REG_READ(ah, AR_ISR_S5_S);
		} else {
		s5_s = REG_READ(ah, AR_ISR_S5);
		}

		ah->intr_gen_timer_trigger =
		MS(s5_s, AR_ISR_S5_GENTIMER_TRIG);

		@@ -134,8 +155,21 @@ static bool ar9002_hw_get_isr(struct ath_hw ah, enum ath9k_int masked,
		if ((s5_s & AR_ISR_S5_TIM_TIMER) &&
		!(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
		*masked \|= ATH9K_INT_TIM_TIMER;

		if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
		REG_WRITE(ah, AR_ISR_S5, s5_s);
		isr &= ~AR_ISR_GENTMR;
		}
		}

		if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
		REG_WRITE(ah, AR_ISR, isr);
		REG_READ(ah, AR_ISR);
		}

		if (AR_SREV_9100(ah))
		return true;

		if (sync_cause) {
		if (sync_cause_p)
		*sync_cause_p = sync_cause;

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

+17 −8

Original line number	Diff line number	Diff line
		@@ -127,21 +127,26 @@ static void ath9k_htc_bssid_iter(void data, u8 mac, struct ieee80211_vif *vif)
		struct ath9k_vif_iter_data *iter_data = data;
		int i;

		if (iter_data->hw_macaddr != NULL) {
		for (i = 0; i < ETH_ALEN; i++)
		iter_data->mask[i] &= ~(iter_data->hw_macaddr[i] ^ mac[i]);
		} else {
		iter_data->hw_macaddr = mac;
		}
		}

		static void ath9k_htc_set_bssid_mask(struct ath9k_htc_priv *priv,
		static void ath9k_htc_set_mac_bssid_mask(struct ath9k_htc_priv *priv,
		struct ieee80211_vif *vif)
		{
		struct ath_common *common = ath9k_hw_common(priv->ah);
		struct ath9k_vif_iter_data iter_data;

		/*
		* Use the hardware MAC address as reference, the hardware uses it
		* together with the BSSID mask when matching addresses.
		* Pick the MAC address of the first interface as the new hardware
		* MAC address. The hardware will use it together with the BSSID mask
		* when matching addresses.
		*/
		iter_data.hw_macaddr = common->macaddr;
		iter_data.hw_macaddr = NULL;
		memset(&iter_data.mask, 0xff, ETH_ALEN);

		if (vif)
		@@ -153,6 +158,10 @@ static void ath9k_htc_set_bssid_mask(struct ath9k_htc_priv *priv,
		ath9k_htc_bssid_iter, &iter_data);

		memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);

		if (iter_data.hw_macaddr)
		memcpy(common->macaddr, iter_data.hw_macaddr, ETH_ALEN);

		ath_hw_setbssidmask(common);
		}

		@@ -1063,7 +1072,7 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
		goto out;
		}

		ath9k_htc_set_bssid_mask(priv, vif);
		ath9k_htc_set_mac_bssid_mask(priv, vif);

		priv->vif_slot \|= (1 << avp->index);
		priv->nvifs++;
		@@ -1128,7 +1137,7 @@ static void ath9k_htc_remove_interface(struct ieee80211_hw *hw,

		ath9k_htc_set_opmode(priv);

		ath9k_htc_set_bssid_mask(priv, vif);
		ath9k_htc_set_mac_bssid_mask(priv, vif);

		/*
		* Stop ANI only if there are no associated station interfaces.

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -991,8 +991,9 @@ void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
		struct ath_common *common = ath9k_hw_common(ah);

		/*
		* Use the hardware MAC address as reference, the hardware uses it
		* together with the BSSID mask when matching addresses.
		* Pick the MAC address of the first interface as the new hardware
		* MAC address. The hardware will use it together with the BSSID mask
		* when matching addresses.
		*/
		memset(iter_data, 0, sizeof(*iter_data));
		memset(&iter_data->mask, 0xff, ETH_ALEN);