Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (7dd30d44) · Commits · e / devices / android_kernel_fairphone_FP4

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -1251,7 +1251,6 @@ ATHEROS ATH5K WIRELESS DRIVER
		M: Jiri Slaby <jirislaby@gmail.com>
		M: Nick Kossifidis <mickflemm@gmail.com>
		M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
		M: Bob Copeland <me@bobcopeland.com>
		L: linux-wireless@vger.kernel.org
		L: ath5k-devel@lists.ath5k.org
		W: http://wireless.kernel.org/en/users/Drivers/ath5k

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@

		/* Common calibration code */

		#define ATH9K_NF_TOO_HIGH -60

		static int16_t ath9k_hw_get_nf_hist_mid(int16_t *nfCalBuffer)
		{
		@@ -346,10 +345,10 @@ static void ath9k_hw_nf_sanitize(struct ath_hw ah, s16 nf)
		"NF calibrated [%s] [chain %d] is %d\n",
		(i >= 3 ? "ext" : "ctl"), i % 3, nf[i]);

		if (nf[i] > ATH9K_NF_TOO_HIGH) {
		if (nf[i] > limit->max) {
		ath_dbg(common, CALIBRATE,
		"NF[%d] (%d) > MAX (%d), correcting to MAX\n",
		i, nf[i], ATH9K_NF_TOO_HIGH);
		i, nf[i], limit->max);
		nf[i] = limit->max;
		} else if (nf[i] < limit->min) {
		ath_dbg(common, CALIBRATE,

+1 −1

Original line number	Diff line number	Diff line
		@@ -680,7 +680,7 @@ void ath9k_set_hw_capab(struct ath_softc sc, struct ieee80211_hw hw)
		hw->queues = 4;
		hw->max_rates = 4;
		hw->channel_change_time = 5000;
		hw->max_listen_interval = 10;
		hw->max_listen_interval = 1;
		hw->max_rate_tries = 10;
		hw->sta_data_size = sizeof(struct ath_node);
		hw->vif_data_size = sizeof(struct ath_vif);

+2 −2

Original line number	Diff line number	Diff line
		@@ -1913,13 +1913,13 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
		if (sc->rx.frag) {
		int space = skb->len - skb_tailroom(hdr_skb);

		sc->rx.frag = NULL;

		if (pskb_expand_head(hdr_skb, 0, space, GFP_ATOMIC) < 0) {
		dev_kfree_skb(skb);
		goto requeue_drop_frag;
		}

		sc->rx.frag = NULL;

		skb_copy_from_linear_data(skb, skb_put(hdr_skb, skb->len),
		skb->len);
		dev_kfree_skb_any(skb);

+0 −2

Original line number	Diff line number	Diff line
		@@ -2673,8 +2673,6 @@ il3945_bg_restart(struct work_struct *data)

		if (test_and_clear_bit(S_FW_ERROR, &il->status)) {
		mutex_lock(&il->mutex);
		/* FIXME: vif can be dereferenced */
		il->vif = NULL;
		il->is_open = 0;
		mutex_unlock(&il->mutex);
		il3945_down(il);