pull request: wireless 2014-03-14
Subsystems (4)
Dave,
Please pull these last(?) few wireless bits intended for the 3.14 stream. Each is here to address a problem found with a patch already merged...
Dave Jones gives us a memory leak fix, for an error path in brcmfmac.
Felix Fietkau moves a small delay to make it actually reachable.
Helmut Schaa fixes an ath9k sequence numbering problem for non-data frames.
Stanislaw Gruszka reverts an earlier fix that was found to cause random connection drops on RT5390 PCI adapters
Please let me know if there are problems! I'll be back from watching the Veronica Mars movie by about 9pm... :-)
Thanks,
John
---
The following changes since commit c60f7d5a8e7c639de5d9dfe07e1e91d302d506e4:
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2014-03-13 21:32:16 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 8c35743fdc3c013cbb9832dc9c5eb04362b86cbb:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2014-03-14 14:09:47 -0400)
----------------------------------------------------------------
Dave Jones (1):
brcmfmac: fix skb leak in brcmf_sdio_txpkt_prep_sg error path.
Felix Fietkau (1):
ath9k_hw: fix unreachable code in baseband hang detection code
Helmut Schaa (1):
ath9k: Fix sequence number assignment for non-data frames
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Stanislaw Gruszka (1):
Revert "rt2x00: rt2800lib: Update BBP register initialization for RT53xx"
drivers/net/wireless/ath/ath9k/hw.c | 3 +-- drivers/net/wireless/ath/ath9k/xmit.c | 4 ++-- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 +++- drivers/net/wireless/rt2x00/rt2800lib.c | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +1 -2
@@ -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
@@ -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
@@ -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
@@ -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);
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Fri, 14 Mar 2014 14:20:26 -0400
Quoted 8 lines
Please pull these last(?) few wireless bits intended for the 3.14 stream. Each is here to address a problem found with a patch already merged...
Dave Jones gives us a memory leak fix, for an error path in brcmfmac.
Felix Fietkau moves a small delay to make it actually reachable.
Quoted 8 lines
Helmut Schaa fixes an ath9k sequence numbering problem for non-data frames.
Stanislaw Gruszka reverts an earlier fix that was found to cause random connection drops on RT5390 PCI adapters
Please let me know if there are problems! I'll be back from watching the Veronica Mars movie by about 9pm... :-)
:-)
Pulled, thanks John.