Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 

Conflicts:
	drivers/net/wireless/brcm80211/Kconfig
	net/mac80211/util.c
parents 251c9ba1 a59b40b3

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

+12 −10
Original line number Original line Diff line number Diff line
@@ -3984,12 +3984,13 @@ static void ar9003_hw_quick_drop_apply(struct ath_hw *ah, u16 freq) 
	int quick_drop;

	int quick_drop;

	s32 t[3], f[3] = {5180, 5500, 5785};

	s32 t[3], f[3] = {5180, 5500, 5785};





	if (!(pBase->miscConfiguration & BIT(1)))

	if (!(pBase->miscConfiguration & BIT(4)))

		return;

		return;





	if (freq < 4000)

	if (AR_SREV_9300(ah) || AR_SREV_9580(ah) || AR_SREV_9340(ah)) {

		if (freq < 4000) {

			quick_drop = eep->modalHeader2G.quick_drop;

			quick_drop = eep->modalHeader2G.quick_drop;

	else {

		} else {

			t[0] = eep->base_ext1.quick_drop_low;

			t[0] = eep->base_ext1.quick_drop_low;

			t[1] = eep->modalHeader5G.quick_drop;

			t[1] = eep->modalHeader5G.quick_drop;

			t[2] = eep->base_ext1.quick_drop_high;

			t[2] = eep->base_ext1.quick_drop_high;
@@ -3997,6 +3998,7 @@ static void ar9003_hw_quick_drop_apply(struct ath_hw *ah, u16 freq) 
		}

		}

		REG_RMW_FIELD(ah, AR_PHY_AGC, AR_PHY_AGC_QUICK_DROP, quick_drop);

		REG_RMW_FIELD(ah, AR_PHY_AGC, AR_PHY_AGC_QUICK_DROP, quick_drop);

	}

	}

}





static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, bool is2ghz)

static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, bool is2ghz)

{

{
@@ -4035,7 +4037,7 @@ static void ar9003_hw_xlna_bias_strength_apply(struct ath_hw *ah, bool is2ghz) 
	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;

	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;

	u8 bias;

	u8 bias;





	if (!(eep->baseEepHeader.featureEnable & 0x40))

	if (!(eep->baseEepHeader.miscConfiguration & 0x40))

		return;

		return;





	if (!AR_SREV_9300(ah))

	if (!AR_SREV_9300(ah))

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -147,10 +147,9 @@ static void ath9k_hw_set_clockrate(struct ath_hw *ah) 
	else

	else

		clockrate = ATH9K_CLOCK_RATE_5GHZ_OFDM;

		clockrate = ATH9K_CLOCK_RATE_5GHZ_OFDM;





	if (chan) {

		if (IS_CHAN_HT40(chan))

		if (IS_CHAN_HT40(chan))

			clockrate *= 2;

			clockrate *= 2;



	if (ah->curchan) {

		if (IS_CHAN_HALF_RATE(chan))

		if (IS_CHAN_HALF_RATE(chan))

			clockrate /= 2;

			clockrate /= 2;

		if (IS_CHAN_QUARTER_RATE(chan))

		if (IS_CHAN_QUARTER_RATE(chan))

drivers/net/wireless/ath/wcn36xx/smd.c

+13 −6
Original line number Original line Diff line number Diff line
@@ -2058,13 +2058,20 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len) 
	case WCN36XX_HAL_DELETE_STA_CONTEXT_IND:

	case WCN36XX_HAL_DELETE_STA_CONTEXT_IND:

		mutex_lock(&wcn->hal_ind_mutex);

		mutex_lock(&wcn->hal_ind_mutex);

		msg_ind = kmalloc(sizeof(*msg_ind), GFP_KERNEL);

		msg_ind = kmalloc(sizeof(*msg_ind), GFP_KERNEL);

		if (msg_ind) {

			msg_ind->msg_len = len;

			msg_ind->msg_len = len;

			msg_ind->msg = kmalloc(len, GFP_KERNEL);

			msg_ind->msg = kmalloc(len, GFP_KERNEL);

			memcpy(msg_ind->msg, buf, len);

			memcpy(msg_ind->msg, buf, len);

			list_add_tail(&msg_ind->list, &wcn->hal_ind_queue);

			list_add_tail(&msg_ind->list, &wcn->hal_ind_queue);

			queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work);

			queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work);

			wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n");

			wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n");

		}

		mutex_unlock(&wcn->hal_ind_mutex);

		mutex_unlock(&wcn->hal_ind_mutex);

		if (msg_ind)

			break;

		/* FIXME: Do something smarter then just printing an error. */

		wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n",

			    msg_header->msg_type);

		break;

		break;

	default:

	default:

		wcn36xx_err("SMD_EVENT (%d) not supported\n",

		wcn36xx_err("SMD_EVENT (%d) not supported\n",

drivers/net/wireless/brcm80211/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,8 @@ config BRCMSMAC 
	depends on MAC80211

	depends on MAC80211

	depends on BCMA_POSSIBLE

	depends on BCMA_POSSIBLE

	select BCMA

	select BCMA

	select NEW_LEDS if BCMA_DRIVER_GPIO

	select LEDS_CLASS if BCMA_DRIVER_GPIO

	select BRCMUTIL

	select BRCMUTIL

	select FW_LOADER

	select FW_LOADER

	select CORDIC

	select CORDIC

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -109,6 +109,8 @@ static inline int brcmf_sdioh_f0_write_byte(struct brcmf_sdio_dev *sdiodev, 
					brcmf_err("Disable F2 failed:%d\n",

					brcmf_err("Disable F2 failed:%d\n",

						  err_ret);

						  err_ret);

			}

			}

		} else {

			err_ret = -ENOENT;

		}

		}

	} else if ((regaddr == SDIO_CCCR_ABORT) ||

	} else if ((regaddr == SDIO_CCCR_ABORT) ||

		   (regaddr == SDIO_CCCR_IENx)) {

		   (regaddr == SDIO_CCCR_IENx)) {