diff options
author | David S. Miller <davem@davemloft.net> | 2012-01-12 15:10:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-12 15:10:00 -0500 |
commit | 9ee6045f09a7875ebe55b9942b232a19076b157b (patch) | |
tree | 4c3924d35d99d413a95205ac21da8d369063234b /drivers | |
parent | 3b09c84cb622ffbcdb5d541986b1eaf7d5812602 (diff) | |
parent | 1140afa862842ac3e56678693050760edc4ecde9 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/calib.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/calib.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 4 |
7 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index 2589b38b689..2b0bfb8cca0 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c | |||
@@ -46,7 +46,7 @@ static const int m2ThreshExt_off = 127; | |||
46 | * @chan: | 46 | * @chan: |
47 | * | 47 | * |
48 | * This is the function to change channel on single-chip devices, that is | 48 | * This is the function to change channel on single-chip devices, that is |
49 | * all devices after ar9280. | 49 | * for AR9300 family of chipsets. |
50 | * | 50 | * |
51 | * This function takes the channel value in MHz and sets | 51 | * This function takes the channel value in MHz and sets |
52 | * hardware channel value. Assumes writes have been enabled to analog bus. | 52 | * hardware channel value. Assumes writes have been enabled to analog bus. |
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index b30e9fc6433..171ccf7c972 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -679,7 +679,6 @@ void ath9k_deinit_device(struct ath_softc *sc); | |||
679 | void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw); | 679 | void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw); |
680 | void ath9k_reload_chainmask_settings(struct ath_softc *sc); | 680 | void ath9k_reload_chainmask_settings(struct ath_softc *sc); |
681 | 681 | ||
682 | void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw); | ||
683 | bool ath9k_uses_beacons(int type); | 682 | bool ath9k_uses_beacons(int type); |
684 | 683 | ||
685 | #ifdef CONFIG_ATH9K_PCI | 684 | #ifdef CONFIG_ATH9K_PCI |
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c index 172e33db7f4..2f4b48e6fb0 100644 --- a/drivers/net/wireless/ath/ath9k/calib.c +++ b/drivers/net/wireless/ath/ath9k/calib.c | |||
@@ -400,6 +400,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan) | |||
400 | ah->noise = ath9k_hw_getchan_noise(ah, chan); | 400 | ah->noise = ath9k_hw_getchan_noise(ah, chan); |
401 | return true; | 401 | return true; |
402 | } | 402 | } |
403 | EXPORT_SYMBOL(ath9k_hw_getnf); | ||
403 | 404 | ||
404 | void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah, | 405 | void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah, |
405 | struct ath9k_channel *chan) | 406 | struct ath9k_channel *chan) |
diff --git a/drivers/net/wireless/ath/ath9k/calib.h b/drivers/net/wireless/ath/ath9k/calib.h index 05b9dbf8185..3b33996d97d 100644 --- a/drivers/net/wireless/ath/ath9k/calib.h +++ b/drivers/net/wireless/ath/ath9k/calib.h | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #include "hw.h" | 20 | #include "hw.h" |
21 | 21 | ||
22 | #define AR_PHY_CCA_FILTERWINDOW_LENGTH_INIT 3 | ||
23 | #define AR_PHY_CCA_FILTERWINDOW_LENGTH 5 | 22 | #define AR_PHY_CCA_FILTERWINDOW_LENGTH 5 |
24 | 23 | ||
25 | #define NUM_NF_READINGS 6 | 24 | #define NUM_NF_READINGS 6 |
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index e267c92dbfb..4a00806e285 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -1629,7 +1629,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) | |||
1629 | 1629 | ||
1630 | if (changed & IEEE80211_CONF_CHANGE_CHANNEL) { | 1630 | if (changed & IEEE80211_CONF_CHANGE_CHANNEL) { |
1631 | struct ieee80211_channel *curchan = hw->conf.channel; | 1631 | struct ieee80211_channel *curchan = hw->conf.channel; |
1632 | struct ath9k_channel old_chan; | ||
1633 | int pos = curchan->hw_value; | 1632 | int pos = curchan->hw_value; |
1634 | int old_pos = -1; | 1633 | int old_pos = -1; |
1635 | unsigned long flags; | 1634 | unsigned long flags; |
@@ -1654,11 +1653,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) | |||
1654 | * Preserve the current channel values, before updating | 1653 | * Preserve the current channel values, before updating |
1655 | * the same channel | 1654 | * the same channel |
1656 | */ | 1655 | */ |
1657 | if (old_pos == pos) { | 1656 | if (ah->curchan && (old_pos == pos)) |
1658 | memcpy(&old_chan, &sc->sc_ah->channels[pos], | 1657 | ath9k_hw_getnf(ah, ah->curchan); |
1659 | sizeof(struct ath9k_channel)); | ||
1660 | ah->curchan = &old_chan; | ||
1661 | } | ||
1662 | 1658 | ||
1663 | ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos], | 1659 | ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos], |
1664 | curchan, conf->channel_type); | 1660 | curchan, conf->channel_type); |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 5a002a21f10..f7eeee1dcdb 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | |||
@@ -3119,8 +3119,10 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus) | |||
3119 | /* Verify NVRAM bytes */ | 3119 | /* Verify NVRAM bytes */ |
3120 | brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize); | 3120 | brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize); |
3121 | nvram_ularray = kmalloc(varsize, GFP_ATOMIC); | 3121 | nvram_ularray = kmalloc(varsize, GFP_ATOMIC); |
3122 | if (!nvram_ularray) | 3122 | if (!nvram_ularray) { |
3123 | kfree(vbuffer); | ||
3123 | return -ENOMEM; | 3124 | return -ENOMEM; |
3125 | } | ||
3124 | 3126 | ||
3125 | /* Upload image to verify downloaded contents. */ | 3127 | /* Upload image to verify downloaded contents. */ |
3126 | memset(nvram_ularray, 0xaa, varsize); | 3128 | memset(nvram_ularray, 0xaa, varsize); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c index 6f91a148c22..3fda6b1dcf4 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c | |||
@@ -196,6 +196,8 @@ static bool _rtl92s_firmware_downloadcode(struct ieee80211_hw *hw, | |||
196 | /* Allocate skb buffer to contain firmware */ | 196 | /* Allocate skb buffer to contain firmware */ |
197 | /* info and tx descriptor info. */ | 197 | /* info and tx descriptor info. */ |
198 | skb = dev_alloc_skb(frag_length); | 198 | skb = dev_alloc_skb(frag_length); |
199 | if (!skb) | ||
200 | return false; | ||
199 | skb_reserve(skb, extra_descoffset); | 201 | skb_reserve(skb, extra_descoffset); |
200 | seg_ptr = (u8 *)skb_put(skb, (u32)(frag_length - | 202 | seg_ptr = (u8 *)skb_put(skb, (u32)(frag_length - |
201 | extra_descoffset)); | 203 | extra_descoffset)); |
@@ -573,6 +575,8 @@ static bool _rtl92s_firmware_set_h2c_cmd(struct ieee80211_hw *hw, u8 h2c_cmd, | |||
573 | 575 | ||
574 | len = _rtl92s_get_h2c_cmdlen(MAX_TRANSMIT_BUFFER_SIZE, 1, &cmd_len); | 576 | len = _rtl92s_get_h2c_cmdlen(MAX_TRANSMIT_BUFFER_SIZE, 1, &cmd_len); |
575 | skb = dev_alloc_skb(len); | 577 | skb = dev_alloc_skb(len); |
578 | if (!skb) | ||
579 | return false; | ||
576 | cb_desc = (struct rtl_tcb_desc *)(skb->cb); | 580 | cb_desc = (struct rtl_tcb_desc *)(skb->cb); |
577 | cb_desc->queue_index = TXCMD_QUEUE; | 581 | cb_desc->queue_index = TXCMD_QUEUE; |
578 | cb_desc->cmd_or_init = DESC_PACKET_TYPE_NORMAL; | 582 | cb_desc->cmd_or_init = DESC_PACKET_TYPE_NORMAL; |