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

Commit ba7c96be 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 057cf65e 6bb4880d

drivers/bcma/scan.c

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ static const struct bcma_device_id_name bcma_bcm_device_names[] = { 
	{ BCMA_CORE_I2S, "I2S" },

	{ BCMA_CORE_SDR_DDR1_MEM_CTL, "SDR/DDR1 Memory Controller" },

	{ BCMA_CORE_SHIM, "SHIM" },

	{ BCMA_CORE_PCIE2, "PCIe Gen2" },

	{ BCMA_CORE_ARM_CR4, "ARM CR4" },

	{ BCMA_CORE_DEFAULT, "Default" },

};

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

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ static void ar9003_hw_do_manual_peak_cal(struct ath_hw *ah, 
{

	int i;



	if (!AR_SREV_9462(ah) && !AR_SREV_9565(ah))

	if (!AR_SREV_9462(ah) && !AR_SREV_9565(ah) && !AR_SREV_9485(ah))

		return;



	for (i = 0; i < AR9300_MAX_CHAINS; i++) {

drivers/net/wireless/ath/ath9k/ar9485_initvals.h

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static const u32 ar9485_1_1_baseband_postamble[][5] = { 
	{0x0000a284, 0x00000000, 0x00000000, 0x000002a0, 0x000002a0},

	{0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},

	{0x0000a2c4, 0x00158d18, 0x00158d18, 0x00058d18, 0x00058d18},

	{0x0000a2d0, 0x00071981, 0x00071981, 0x00071982, 0x00071982},

	{0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},

	{0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

drivers/net/wireless/ath/ath9k/ath9k.h

+3 −1
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ struct ath_atx_tid { 
	int sched;

	int paused;

	u8 state;

	bool stop_cb;

};



struct ath_node {
@@ -351,7 +352,8 @@ void ath_tx_tasklet(struct ath_softc *sc); 
void ath_tx_edma_tasklet(struct ath_softc *sc);

int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,

		      u16 tid, u16 *ssn);

void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);

bool ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid,

		      bool flush);

void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);



void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an);

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

+8 −0
Original line number Diff line number Diff line
@@ -2008,6 +2008,14 @@ void ath9k_get_et_stats(struct ieee80211_hw *hw, 
	WARN_ON(i != ATH9K_SSTATS_LEN);

}



void ath9k_deinit_debug(struct ath_softc *sc)

{

	if (config_enabled(CONFIG_ATH9K_DEBUGFS) && sc->rfs_chan_spec_scan) {

		relay_close(sc->rfs_chan_spec_scan);

		sc->rfs_chan_spec_scan = NULL;

	}

}



int ath9k_init_debug(struct ath_hw *ah)

{

	struct ath_common *common = ath9k_hw_common(ah);