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

Commit 8c35743f 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 c60f7d5a 58422191

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

+1 −2
Original line number Diff line number Diff line
@@ -1548,6 +1548,7 @@ bool ath9k_hw_check_alive(struct ath_hw *ah) 
		if (reg != last_val)

			return true;



		udelay(1);

		last_val = reg;

		if ((reg & 0x7E7FFFEF) == 0x00702400)

			continue;
@@ -1560,8 +1561,6 @@ bool ath9k_hw_check_alive(struct ath_hw *ah) 
		default:

			return true;

		}



		udelay(1);

	} while (count-- > 0);



	return false;

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

+2 −2
Original line number Diff line number Diff line
@@ -2063,7 +2063,7 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc, 


	ATH_TXBUF_RESET(bf);



	if (tid) {

	if (tid && ieee80211_is_data_present(hdr->frame_control)) {

		fragno = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;

		seqno = tid->seq_next;

		hdr->seq_ctrl = cpu_to_le16(tid->seq_next << IEEE80211_SEQ_SEQ_SHIFT);
@@ -2186,7 +2186,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, 
		txq->stopped = true;

	}



	if (txctl->an)

	if (txctl->an && ieee80211_is_data_present(hdr->frame_control))

		tid = ath_get_skb_tid(sc, txctl->an, skb);



	if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) {

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

+3 −1
Original line number Diff line number Diff line
@@ -1948,8 +1948,10 @@ static int brcmf_sdio_txpkt_prep_sg(struct brcmf_sdio *bus, 
		if (pkt_pad == NULL)

			return -ENOMEM;

		ret = brcmf_sdio_txpkt_hdalign(bus, pkt_pad);

		if (unlikely(ret < 0))

		if (unlikely(ret < 0)) {

			kfree_skb(pkt_pad);

			return ret;

		}

		memcpy(pkt_pad->data,

		       pkt->data + pkt->len - tail_chop,

		       tail_chop);

drivers/net/wireless/rt2x00/rt2800lib.c

+3 −3
Original line number Diff line number Diff line
@@ -5460,14 +5460,15 @@ static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev) 


	rt2800_bbp_write(rt2x00dev, 68, 0x0b);



	rt2800_bbp_write(rt2x00dev, 69, 0x0d);

	rt2800_bbp_write(rt2x00dev, 70, 0x06);

	rt2800_bbp_write(rt2x00dev, 69, 0x12);

	rt2800_bbp_write(rt2x00dev, 73, 0x13);

	rt2800_bbp_write(rt2x00dev, 75, 0x46);

	rt2800_bbp_write(rt2x00dev, 76, 0x28);



	rt2800_bbp_write(rt2x00dev, 77, 0x59);



	rt2800_bbp_write(rt2x00dev, 70, 0x0a);



	rt2800_bbp_write(rt2x00dev, 79, 0x13);

	rt2800_bbp_write(rt2x00dev, 80, 0x05);

	rt2800_bbp_write(rt2x00dev, 81, 0x33);
@@ -5510,7 +5511,6 @@ static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev) 
	if (rt2x00_rt(rt2x00dev, RT5392)) {

		rt2800_bbp_write(rt2x00dev, 134, 0xd0);

		rt2800_bbp_write(rt2x00dev, 135, 0xf6);

		rt2800_bbp_write(rt2x00dev, 148, 0x84);

	}



	rt2800_disable_unused_dac_adc(rt2x00dev);