diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 0992f7c70e1a..c8a9dfab1fee 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1547,6 +1547,7 @@ bool ath9k_hw_check_alive(struct ath_hw *ah) | |||
1547 | if (reg != last_val) | 1547 | if (reg != last_val) |
1548 | return true; | 1548 | return true; |
1549 | 1549 | ||
1550 | udelay(1); | ||
1550 | last_val = reg; | 1551 | last_val = reg; |
1551 | if ((reg & 0x7E7FFFEF) == 0x00702400) | 1552 | if ((reg & 0x7E7FFFEF) == 0x00702400) |
1552 | continue; | 1553 | continue; |
@@ -1559,8 +1560,6 @@ bool ath9k_hw_check_alive(struct ath_hw *ah) | |||
1559 | default: | 1560 | default: |
1560 | return true; | 1561 | return true; |
1561 | } | 1562 | } |
1562 | |||
1563 | udelay(1); | ||
1564 | } while (count-- > 0); | 1563 | } while (count-- > 0); |
1565 | 1564 | ||
1566 | return false; | 1565 | return false; |
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index f76e6b9bb8e6..87cbec47fb48 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -2065,7 +2065,7 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc, | |||
2065 | 2065 | ||
2066 | ATH_TXBUF_RESET(bf); | 2066 | ATH_TXBUF_RESET(bf); |
2067 | 2067 | ||
2068 | if (tid) { | 2068 | if (tid && ieee80211_is_data_present(hdr->frame_control)) { |
2069 | fragno = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG; | 2069 | fragno = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG; |
2070 | seqno = tid->seq_next; | 2070 | seqno = tid->seq_next; |
2071 | hdr->seq_ctrl = cpu_to_le16(tid->seq_next << IEEE80211_SEQ_SEQ_SHIFT); | 2071 | hdr->seq_ctrl = cpu_to_le16(tid->seq_next << IEEE80211_SEQ_SEQ_SHIFT); |
@@ -2188,7 +2188,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
2188 | txq->stopped = true; | 2188 | txq->stopped = true; |
2189 | } | 2189 | } |
2190 | 2190 | ||
2191 | if (txctl->an) | 2191 | if (txctl->an && ieee80211_is_data_present(hdr->frame_control)) |
2192 | tid = ath_get_skb_tid(sc, txctl->an, skb); | 2192 | tid = ath_get_skb_tid(sc, txctl->an, skb); |
2193 | 2193 | ||
2194 | if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) { | 2194 | if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) { |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 47a6f3957b7f..13c89a0c4ba7 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | |||
@@ -2140,8 +2140,10 @@ static int brcmf_sdio_txpkt_prep_sg(struct brcmf_sdio *bus, | |||
2140 | if (pkt_pad == NULL) | 2140 | if (pkt_pad == NULL) |
2141 | return -ENOMEM; | 2141 | return -ENOMEM; |
2142 | ret = brcmf_sdio_txpkt_hdalign(bus, pkt_pad); | 2142 | ret = brcmf_sdio_txpkt_hdalign(bus, pkt_pad); |
2143 | if (unlikely(ret < 0)) | 2143 | if (unlikely(ret < 0)) { |
2144 | kfree_skb(pkt_pad); | ||
2144 | return ret; | 2145 | return ret; |
2146 | } | ||
2145 | memcpy(pkt_pad->data, | 2147 | memcpy(pkt_pad->data, |
2146 | pkt->data + pkt->len - tail_chop, | 2148 | pkt->data + pkt->len - tail_chop, |
2147 | tail_chop); | 2149 | tail_chop); |
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 7f8b5d156c8c..41d4a8167dc3 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -5460,14 +5460,15 @@ static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev) | |||
5460 | 5460 | ||
5461 | rt2800_bbp_write(rt2x00dev, 68, 0x0b); | 5461 | rt2800_bbp_write(rt2x00dev, 68, 0x0b); |
5462 | 5462 | ||
5463 | rt2800_bbp_write(rt2x00dev, 69, 0x0d); | 5463 | rt2800_bbp_write(rt2x00dev, 69, 0x12); |
5464 | rt2800_bbp_write(rt2x00dev, 70, 0x06); | ||
5465 | rt2800_bbp_write(rt2x00dev, 73, 0x13); | 5464 | rt2800_bbp_write(rt2x00dev, 73, 0x13); |
5466 | rt2800_bbp_write(rt2x00dev, 75, 0x46); | 5465 | rt2800_bbp_write(rt2x00dev, 75, 0x46); |
5467 | rt2800_bbp_write(rt2x00dev, 76, 0x28); | 5466 | rt2800_bbp_write(rt2x00dev, 76, 0x28); |
5468 | 5467 | ||
5469 | rt2800_bbp_write(rt2x00dev, 77, 0x59); | 5468 | rt2800_bbp_write(rt2x00dev, 77, 0x59); |
5470 | 5469 | ||
5470 | rt2800_bbp_write(rt2x00dev, 70, 0x0a); | ||
5471 | |||
5471 | rt2800_bbp_write(rt2x00dev, 79, 0x13); | 5472 | rt2800_bbp_write(rt2x00dev, 79, 0x13); |
5472 | rt2800_bbp_write(rt2x00dev, 80, 0x05); | 5473 | rt2800_bbp_write(rt2x00dev, 80, 0x05); |
5473 | rt2800_bbp_write(rt2x00dev, 81, 0x33); | 5474 | rt2800_bbp_write(rt2x00dev, 81, 0x33); |
@@ -5510,7 +5511,6 @@ static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev) | |||
5510 | if (rt2x00_rt(rt2x00dev, RT5392)) { | 5511 | if (rt2x00_rt(rt2x00dev, RT5392)) { |
5511 | rt2800_bbp_write(rt2x00dev, 134, 0xd0); | 5512 | rt2800_bbp_write(rt2x00dev, 134, 0xd0); |
5512 | rt2800_bbp_write(rt2x00dev, 135, 0xf6); | 5513 | rt2800_bbp_write(rt2x00dev, 135, 0xf6); |
5513 | rt2800_bbp_write(rt2x00dev, 148, 0x84); | ||
5514 | } | 5514 | } |
5515 | 5515 | ||
5516 | rt2800_disable_unused_dac_adc(rt2x00dev); | 5516 | rt2800_disable_unused_dac_adc(rt2x00dev); |