Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (891dc5e7) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/wireless/ath/ath5k/base.c

+3 −15

Original line number	Diff line number	Diff line
		@@ -1903,17 +1903,6 @@ ath5k_tasklet_rx(unsigned long data)
		rxs->noise = sc->ah->ah_noise_floor;
		rxs->signal = rxs->noise + rs.rs_rssi;

		/* An rssi of 35 indicates you should be able use
		* 54 Mbps reliably. A more elaborate scheme can be used
		* here but it requires a map of SNR/throughput for each
		* possible mode used */
		rxs->qual = rs.rs_rssi * 100 / 35;

		/* rssi can be more than 35 though, anything above that
		* should be considered at 100% */
		if (rxs->qual > 100)
		rxs->qual = 100;

		rxs->antenna = rs.rs_antenna;
		rxs->rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate);
		rxs->flag \|= ath5k_rx_decrypted(sc, ds, skb, &rs);
		@@ -2381,6 +2370,9 @@ ath5k_init(struct ath5k_softc *sc)
		*/
		ath5k_stop_locked(sc);

		/* Set PHY calibration interval */
		ah->ah_cal_intval = ath5k_calinterval;

		/*
		* The basic interface to setting the hardware in a good
		* state is ``reset''. On return the hardware is known to
		@@ -2408,10 +2400,6 @@ ath5k_init(struct ath5k_softc *sc)

		/* Set ack to be sent at low bit-rates */
		ath5k_hw_set_ack_bitrate_high(ah, false);

		/* Set PHY calibration inteval */
		ah->ah_cal_intval = ath5k_calinterval;

		ret = 0;
		done:
		mmiowb();

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,9 @@
		#define ATH9K_TXERR_XTXOP 0x08
		#define ATH9K_TXERR_TIMER_EXPIRED 0x10
		#define ATH9K_TX_ACKED 0x20
		#define ATH9K_TXERR_MASK \
		(ATH9K_TXERR_XRETRY \| ATH9K_TXERR_FILT \| ATH9K_TXERR_FIFO \| \
		ATH9K_TXERR_XTXOP \| ATH9K_TXERR_TIMER_EXPIRED)

		#define ATH9K_TX_BA 0x01
		#define ATH9K_TX_PWRMGMT 0x02

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -2504,6 +2504,9 @@ static void ath9k_stop(struct ieee80211_hw *hw)
		return; /* another wiphy still in use */
		}

		/* Ensure HW is awake when we try to shut it down. */
		ath9k_ps_wakeup(sc);

		if (ah->btcoex_hw.enabled) {
		ath9k_hw_btcoex_disable(ah);
		if (ah->btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)
		@@ -2524,6 +2527,9 @@ static void ath9k_stop(struct ieee80211_hw *hw)
		/* disable HAL and put h/w to sleep */
		ath9k_hw_disable(ah);
		ath9k_hw_configpcipowersave(ah, 1, 1);
		ath9k_ps_restore(sc);

		/* Finally, put the chip in FULL SLEEP mode */
		ath9k_setpower(sc, ATH9K_PM_FULL_SLEEP);

		sc->sc_flags \|= SC_OP_INVALID;
		@@ -2637,8 +2643,10 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
		if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) \|\|
		(sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC) \|\|
		(sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) {
		ath9k_ps_wakeup(sc);
		ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
		ath_beacon_return(sc, avp);
		ath9k_ps_restore(sc);
		}

		sc->sc_flags &= ~SC_OP_BEACONS;
		@@ -3087,15 +3095,21 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
		case IEEE80211_AMPDU_RX_STOP:
		break;
		case IEEE80211_AMPDU_TX_START:
		ath9k_ps_wakeup(sc);
		ath_tx_aggr_start(sc, sta, tid, ssn);
		ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
		ath9k_ps_restore(sc);
		break;
		case IEEE80211_AMPDU_TX_STOP:
		ath9k_ps_wakeup(sc);
		ath_tx_aggr_stop(sc, sta, tid);
		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
		ath9k_ps_restore(sc);
		break;
		case IEEE80211_AMPDU_TX_OPERATIONAL:
		ath9k_ps_wakeup(sc);
		ath_tx_aggr_resume(sc, sta, tid);
		ath9k_ps_restore(sc);
		break;
		default:
		ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ static void ath_pci_bt_coex_prep(struct ath_common *common)
		pci_write_config_byte(pdev, ATH_PCIE_CAP_LINK_CTRL, aspm);
		}

		const static struct ath_bus_ops ath_pci_bus_ops = {
		static const struct ath_bus_ops ath_pci_bus_ops = {
		.read_cachesize = ath_pci_read_cachesize,
		.cleanup = ath_pci_cleanup,
		.eeprom_read = ath_pci_eeprom_read,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2072,7 +2072,7 @@ static void ath_tx_processq(struct ath_softc sc, struct ath_txq txq)
		&txq->axq_q, lastbf->list.prev);

		txq->axq_depth--;
		txok = !(ds->ds_txstat.ts_status & ATH9K_TXERR_FILT);
		txok = !(ds->ds_txstat.ts_status & ATH9K_TXERR_MASK);
		txq->axq_tx_inprogress = false;
		spin_unlock_bh(&txq->axq_lock);