Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 (2f6d7c1b) · Commits · e / devices / android_kernel_xiaomi_markw

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1293,7 +1293,9 @@ static void ar9170_op_stop(struct ieee80211_hw *hw)
		flush_workqueue(ar->hw->workqueue);

		cancel_delayed_work_sync(&ar->tx_janitor);
		#ifdef CONFIG_AR9170_LEDS
		cancel_delayed_work_sync(&ar->led_work);
		#endif
		cancel_work_sync(&ar->filter_config_work);
		cancel_work_sync(&ar->beacon_work);
		mutex_lock(&ar->mutex);

drivers/net/wireless/ath/ath9k/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,6 @@ config ATH9K_DEBUG
		Say Y, if you need ath9k to display debug messages.
		Pass the debug mask as a module parameter:

		modprobe ath9k debug=0x00002000
		modprobe ath9k debug=0x00000200

		Look in ath9k/core.h for possible debug masks
		Look in ath9k/debug.h for possible debug masks

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -190,12 +190,9 @@ void ath_descdma_cleanup(struct ath_softc sc, struct ath_descdma dd,
		#define ATH_AGGR_MIN_QDEPTH 2
		#define ATH_AMPDU_SUBFRAME_DEFAULT 32
		#define ATH_AMPDU_LIMIT_MAX (64 * 1024 - 1)
		#define ATH_AMPDU_LIMIT_DEFAULT ATH_AMPDU_LIMIT_MAX

		#define IEEE80211_SEQ_SEQ_SHIFT 4
		#define IEEE80211_SEQ_MAX 4096
		#define IEEE80211_MIN_AMPDU_BUF 0x8
		#define IEEE80211_HTCAP_MAXRXAMPDU_FACTOR 13
		#define IEEE80211_WEP_IVLEN 3
		#define IEEE80211_WEP_KIDLEN 1
		#define IEEE80211_WEP_CRCLEN 4
		@@ -240,7 +237,6 @@ struct ath_txq {
		spinlock_t axq_lock;
		u32 axq_depth;
		u8 axq_aggr_depth;
		u32 axq_totalqueued;
		bool stopped;
		bool axq_tx_inprogress;
		struct ath_buf *axq_linkbuf;
		@@ -365,9 +361,9 @@ int ath_tx_start(struct ieee80211_hw hw, struct sk_buff skb,
		void ath_tx_tasklet(struct ath_softc *sc);
		void ath_tx_cabq(struct ieee80211_hw hw, struct sk_buff skb);
		bool ath_tx_aggr_check(struct ath_softc sc, struct ath_node an, u8 tidno);
		int ath_tx_aggr_start(struct ath_softc sc, struct ieee80211_sta sta,
		void ath_tx_aggr_start(struct ath_softc sc, struct ieee80211_sta sta,
		u16 tid, u16 *ssn);
		int ath_tx_aggr_stop(struct ath_softc sc, struct ieee80211_sta sta, u16 tid);
		void ath_tx_aggr_stop(struct ath_softc sc, struct ieee80211_sta sta, u16 tid);
		void ath_tx_aggr_resume(struct ath_softc sc, struct ieee80211_sta sta, u16 tid);

		/********/
		@@ -576,6 +572,7 @@ struct ath_softc {
		u32 keymax;
		DECLARE_BITMAP(keymap, ATH_KEYMAX);
		u8 splitmic;
		bool ps_enabled;
		unsigned long ps_usecount;
		enum ath9k_int imask;
		enum ath9k_ht_extprotspacing ht_extprotspacing;

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

+14 −8

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ static void ath9k_hw_do_getnf(struct ath_hw *ah,
		"NF calibrated [ctl] [chain 1] is %d\n", nf);
		nfarray[1] = nf;

		if (!AR_SREV_9280(ah)) {
		if (!AR_SREV_9280(ah) && !AR_SREV_9287(ah)) {
		nf = MS(REG_READ(ah, AR_PHY_CH2_CCA),
		AR_PHY_CH2_MINCCA_PWR);
		if (nf & 0x100)
		@@ -154,7 +154,7 @@ static void ath9k_hw_do_getnf(struct ath_hw *ah,
		"NF calibrated [ext] [chain 1] is %d\n", nf);
		nfarray[4] = nf;

		if (!AR_SREV_9280(ah)) {
		if (!AR_SREV_9280(ah) && !AR_SREV_9287(ah)) {
		nf = MS(REG_READ(ah, AR_PHY_CH2_EXT_CCA),
		AR_PHY_CH2_EXT_MINCCA_PWR);
		if (nf & 0x100)
		@@ -613,7 +613,7 @@ void ath9k_hw_loadnf(struct ath_hw ah, struct ath9k_channel chan)

		if (AR_SREV_9285(ah))
		chainmask = 0x9;
		else if (AR_SREV_9280(ah))
		else if (AR_SREV_9280(ah) \|\| AR_SREV_9287(ah))
		chainmask = 0x1B;
		else
		chainmask = 0x3F;
		@@ -873,7 +873,7 @@ bool ath9k_hw_calibrate(struct ath_hw ah, struct ath9k_channel chan,
		if (AR_SREV_9285_11_OR_LATER(ah))
		ath9k_hw_9285_pa_cal(ah);

		if (OLC_FOR_AR9280_20_LATER)
		if (OLC_FOR_AR9280_20_LATER \|\| OLC_FOR_AR9287_10_LATER)
		ath9k_olc_temp_compensation(ah);
		ath9k_hw_getnf(ah, chan);
		ath9k_hw_loadnf(ah, ah->curchan);
		@@ -929,8 +929,11 @@ bool ath9k_hw_init_cal(struct ath_hw ah, struct ath9k_channel chan)
		return false;
		} else {
		if (AR_SREV_9280_10_OR_LATER(ah)) {
		REG_CLR_BIT(ah, AR_PHY_ADC_CTL, AR_PHY_ADC_CTL_OFF_PWDADC);
		REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_FLTR_CAL);
		if (!AR_SREV_9287_10_OR_LATER(ah))
		REG_CLR_BIT(ah, AR_PHY_ADC_CTL,
		AR_PHY_ADC_CTL_OFF_PWDADC);
		REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
		AR_PHY_AGC_CONTROL_FLTR_CAL);
		}

		/* Calibrate the AGC */
		@@ -948,8 +951,11 @@ bool ath9k_hw_init_cal(struct ath_hw ah, struct ath9k_channel chan)
		}

		if (AR_SREV_9280_10_OR_LATER(ah)) {
		REG_SET_BIT(ah, AR_PHY_ADC_CTL, AR_PHY_ADC_CTL_OFF_PWDADC);
		REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_FLTR_CAL);
		if (!AR_SREV_9287_10_OR_LATER(ah))
		REG_SET_BIT(ah, AR_PHY_ADC_CTL,
		AR_PHY_ADC_CTL_OFF_PWDADC);
		REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,
		AR_PHY_AGC_CONTROL_FLTR_CAL);
		}
		}

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

+85 −0

Original line number	Diff line number	Diff line
		@@ -486,6 +486,83 @@ static const struct file_operations fops_wiphy = {
		.owner = THIS_MODULE
		};

		#define PR(str, elem) \
		do { \
		len += snprintf(buf + len, size - len, \
		"%s%13u%11u%10u%10u\n", str, \
		sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BE]].elem, \
		sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BK]].elem, \
		sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VI]].elem, \
		sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VO]].elem); \
		} while(0)

		static ssize_t read_file_xmit(struct file file, char __user user_buf,
		size_t count, loff_t *ppos)
		{
		struct ath_softc *sc = file->private_data;
		char *buf;
		unsigned int len = 0, size = 2048;
		ssize_t retval = 0;

		buf = kzalloc(size, GFP_KERNEL);
		if (buf == NULL)
		return 0;

		len += sprintf(buf, "%30s %10s%10s%10s\n\n", "BE", "BK", "VI", "VO");

		PR("MPDUs Queued: ", queued);
		PR("MPDUs Completed: ", completed);
		PR("Aggregates: ", a_aggr);
		PR("AMPDUs Queued: ", a_queued);
		PR("AMPDUs Completed:", a_completed);
		PR("AMPDUs Retried: ", a_retries);
		PR("AMPDUs XRetried: ", a_xretries);
		PR("FIFO Underrun: ", fifo_underrun);
		PR("TXOP Exceeded: ", xtxop);
		PR("TXTIMER Expiry: ", timer_exp);
		PR("DESC CFG Error: ", desc_cfg_err);
		PR("DATA Underrun: ", data_underrun);
		PR("DELIM Underrun: ", delim_underrun);

		retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
		kfree(buf);

		return retval;
		}

		void ath_debug_stat_tx(struct ath_softc sc, struct ath_txq txq,
		struct ath_buf *bf)
		{
		struct ath_desc *ds = bf->bf_desc;

		if (bf_isampdu(bf)) {
		if (bf_isxretried(bf))
		TX_STAT_INC(txq->axq_qnum, a_xretries);
		else
		TX_STAT_INC(txq->axq_qnum, a_completed);
		} else {
		TX_STAT_INC(txq->axq_qnum, completed);
		}

		if (ds->ds_txstat.ts_status & ATH9K_TXERR_FIFO)
		TX_STAT_INC(txq->axq_qnum, fifo_underrun);
		if (ds->ds_txstat.ts_status & ATH9K_TXERR_XTXOP)
		TX_STAT_INC(txq->axq_qnum, xtxop);
		if (ds->ds_txstat.ts_status & ATH9K_TXERR_TIMER_EXPIRED)
		TX_STAT_INC(txq->axq_qnum, timer_exp);
		if (ds->ds_txstat.ts_flags & ATH9K_TX_DESC_CFG_ERR)
		TX_STAT_INC(txq->axq_qnum, desc_cfg_err);
		if (ds->ds_txstat.ts_flags & ATH9K_TX_DATA_UNDERRUN)
		TX_STAT_INC(txq->axq_qnum, data_underrun);
		if (ds->ds_txstat.ts_flags & ATH9K_TX_DELIM_UNDERRUN)
		TX_STAT_INC(txq->axq_qnum, delim_underrun);
		}

		static const struct file_operations fops_xmit = {
		.read = read_file_xmit,
		.open = ath9k_debugfs_open,
		.owner = THIS_MODULE
		};

		int ath9k_init_debug(struct ath_softc *sc)
		{
		@@ -529,6 +606,13 @@ int ath9k_init_debug(struct ath_softc *sc)
		if (!sc->debug.debugfs_wiphy)
		goto err;

		sc->debug.debugfs_xmit = debugfs_create_file("xmit",
		S_IRUSR,
		sc->debug.debugfs_phy,
		sc, &fops_xmit);
		if (!sc->debug.debugfs_xmit)
		goto err;

		return 0;
		err:
		ath9k_exit_debug(sc);
		@@ -537,6 +621,7 @@ err:

		void ath9k_exit_debug(struct ath_softc *sc)
		{
		debugfs_remove(sc->debug.debugfs_xmit);
		debugfs_remove(sc->debug.debugfs_wiphy);
		debugfs_remove(sc->debug.debugfs_rcstat);
		debugfs_remove(sc->debug.debugfs_interrupt);