pull request: wireless-2.6 2010-03-12
Subsystems (5)
Dave,
Here is a round of fixes intended for 2.6.34. I don't think there is anything controversial here -- they are all reasonably small, targeted, and are fixes to real problems. I believe they are all well represented by their changelog entries as well.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 717ea4b3474852057b1ce2c639ce219f4f8d3a8d:
Greg Ungerer (1):
net: add ColdFire support to the smc91x driver
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
Bruno Randolf (4):
ath5k: use fixed antenna for tx descriptors
ath5k: fix TSF reset
ath5k: fix I/Q calibration (for real)
ath5k: read eeprom IQ calibration values correctly for G mode
Eric Dumazet (1):
mac80211: Fix memory leak in ieee80211_if_write()
Helmut Schaa (1):
rt2x00: remove KSEG1ADDR define from rt2x00soc.h
John W. Linville (1):
Merge branch 'wireless-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
Jouni Malinen (1):
mac80211: Fix sta_mtx unlocking on insert STA failure path
Juuso Oikarinen (1):
mac80211: Fix (dynamic) power save entry
Reinette Chatre (2):
iwl3945: fix memory corruption
Revert "iwlwifi: Send broadcast probe request only when asked to"
Zhu Yi (2):
libipw: split ieee->networks into small pieces
ipw2200: use kmalloc for large local variables
drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- drivers/net/wireless/ath/ath5k/phy.c | 41 +++++++++++---------- drivers/net/wireless/ath/ath5k/reg.h | 1 + drivers/net/wireless/ath/ath5k/reset.c | 22 ++++++----- drivers/net/wireless/ipw2x00/ipw2200.c | 19 +++++++++- drivers/net/wireless/ipw2x00/libipw.h | 2 +- drivers/net/wireless/ipw2x00/libipw_module.c | 37 +++++++++---------- drivers/net/wireless/iwlwifi/iwl-3945.c | 6 ++-- drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 49 ++++++++----------------- drivers/net/wireless/rt2x00/rt2x00soc.h | 2 - net/mac80211/debugfs_netdev.c | 10 ++++-- net/mac80211/mlme.c | 13 ++++--- net/mac80211/sta_info.c | 1 + 14 files changed, 107 insertions(+), 102 deletions(-)
drivers/net/wireless/ath/ath5k/eeprom.c +2 -2
@@ -429,8 +429,8 @@ static int ath5k_eeprom_read_modes(struct ath5k_hw *ah, u32 *offset, ee->ee_margin_tx_rx[mode] = (val >>8 ) &0x3f ;AR5K_EEPROM_READ (o++, val); - ee->ee_i_cal[mode] = (val >>8 ) &0x3f ; - ee->ee_q_cal[mode] = (val >>3 ) &0x1f ; + ee->ee_i_cal[mode] = (val >>5 ) &0x3f ; + ee->ee_q_cal[mode] = val &0x1f ;if (ah->ah_ee_version >=AR5K_EEPROM_VERSION_4_2 ) {AR5K_EEPROM_READ (o++, val);
drivers/net/wireless/ath/ath5k/phy.c +21 -20
73 lines not on this page · raw message
drivers/net/wireless/ath/ath5k/reg.h +1 -0
@@ -2187,6 +2187,7 @@*/ #define AR5K_PHY_IQ 0x9920/* Register Address */ #define AR5K_PHY_IQ_CORR_Q_Q_COFF 0x0000001f/* Mask for q correction info */ +#define AR5K_PHY_IQ_CORR_Q_Q_COFF_S 0#define AR5K_PHY_IQ_CORR_Q_I_COFF 0x000007e0/* Mask for i correction info */ #define AR5K_PHY_IQ_CORR_Q_I_COFF_S 5#define AR5K_PHY_IQ_CORR_ENABLE 0x00000800/* Enable i/q correction */
drivers/net/wireless/ath/ath5k/reset.c +12 -10
@@ -851,12 +851,15 @@ static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,AR5K_PHY_OFDM_SELFCORR_CYPWR_THR1 , AR5K_INIT_CYCRSSI_THR1); -/* I/Q correction -* TODO: Per channel i/q infos ? */ -AR5K_REG_ENABLE_BITS (ah,AR5K_PHY_IQ , -AR5K_PHY_IQ_CORR_ENABLE | - (ee->ee_i_cal[ee_mode] <<AR5K_PHY_IQ_CORR_Q_I_COFF_S ) | - ee->ee_q_cal[ee_mode]); +/* I/Q correction (set enable bit last to match HAL sources) */ +/* TODO: Per channel i/q infos ? */ +if (ah->ah_ee_version >=AR5K_EEPROM_VERSION_4_0 ) { +AR5K_REG_WRITE_BITS (ah,AR5K_PHY_IQ ,AR5K_PHY_IQ_CORR_Q_I_COFF , + ee->ee_i_cal[ee_mode]); +AR5K_REG_WRITE_BITS (ah,AR5K_PHY_IQ ,AR5K_PHY_IQ_CORR_Q_Q_COFF , + ee->ee_q_cal[ee_mode]); +AR5K_REG_ENABLE_BITS (ah,AR5K_PHY_IQ ,AR5K_PHY_IQ_CORR_ENABLE ); + }/* Heavy clipping -disable for now */ if (ah->ah_ee_version >=AR5K_EEPROM_VERSION_5_1 )
@@ -1379,11 +1382,10 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,ath5k_hw_set_sleep_clock (ah, true);/* -* Disable beacons and reset the register +* Disable beacons and reset the TSF */ -AR5K_REG_DISABLE_BITS (ah,AR5K_BEACON ,AR5K_BEACON_ENABLE | -AR5K_BEACON_RESET_TSF ); - +AR5K_REG_DISABLE_BITS (ah,AR5K_BEACON ,AR5K_BEACON_ENABLE ); +ath5k_hw_reset_tsf (ah);return 0 ; }
drivers/net/wireless/ipw2x00/ipw2200.c +17 -2
@@ -3177,14 +3177,27 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)int total_nr =0 ;int i;struct pci_pool *pool; -u32 *virts[CB_NUMBER_OF_ELEMENTS_SMALL ]; -dma_addr_t phys[CB_NUMBER_OF_ELEMENTS_SMALL ]; +void **virts; +dma_addr_t *phys;IPW_DEBUG_TRACE ("<< : \n" ); + virts =kmalloc (sizeof (void *) *CB_NUMBER_OF_ELEMENTS_SMALL , +GFP_KERNEL ); +if (!virts) +return -ENOMEM ; + + phys =kmalloc (sizeof (dma_addr_t) *CB_NUMBER_OF_ELEMENTS_SMALL , +GFP_KERNEL ); +if (!phys) { +kfree (virts); +return -ENOMEM ; + } pool =pci_pool_create ("ipw2200" , priv->pci_dev,CB_MAX_LENGTH ,0 ,0 );if (!pool) {IPW_ERROR ("pci_pool_create failed\n" ); +kfree (phys); +kfree (virts);return -ENOMEM ; }
@@ -3254,6 +3267,8 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)pci_pool_free (pool, virts[i], phys[i]);pci_pool_destroy (pool); +kfree (phys); +kfree (virts);return ret; }
drivers/net/wireless/ipw2x00/libipw.h +1 -1
@@ -797,7 +797,7 @@ struct libipw_device {/* Probe / Beacon management */ struct list_head network_free_list;struct list_head network_list; -struct libipw_network *networks; +struct libipw_network *networks[MAX_NETWORK_COUNT ];int scans;int scan_age;
drivers/net/wireless/ipw2x00/libipw_module.c +17 -20
@@ -67,16 +67,17 @@ void *libipw_wiphy_privid = &libipw_wiphy_privid;static int libipw_networks_allocate (struct libipw_device *ieee) { -if (ieee->networks) -return 0 ; - - ieee->networks = -kzalloc (MAX_NETWORK_COUNT *sizeof (struct libipw_network ), -GFP_KERNEL ); -if (!ieee->networks) { -printk (KERN_WARNING "%s: Out of memory allocating beacons\n" , - ieee->dev->name); -return -ENOMEM ; +int i, j; + +for (i =0 ; i <MAX_NETWORK_COUNT ; i++) { + ieee->networks[i] =kzalloc (sizeof (struct libipw_network ), +GFP_KERNEL ); +if (!ieee->networks[i]) { +LIBIPW_ERROR ("Out of memory allocating beacons\n" ); +for (j =0 ; j < i; j++) +kfree (ieee->networks[j]); +return -ENOMEM ; + } }return 0 ;
@@ -97,15 +98,11 @@ static inline void libipw_networks_free(struct libipw_device *ieee) {int i; -if (!ieee->networks) -return ; - -for (i =0 ; i <MAX_NETWORK_COUNT ; i++) -if (ieee->networks[i].ibss_dfs) -kfree (ieee->networks[i].ibss_dfs); - -kfree (ieee->networks); - ieee->networks =NULL ; +for (i =0 ; i <MAX_NETWORK_COUNT ; i++) { +if (ieee->networks[i]->ibss_dfs) +kfree (ieee->networks[i]->ibss_dfs); +kfree (ieee->networks[i]); + } } void libipw_networks_age(struct libipw_device *ieee,
@@ -130,7 +127,7 @@ static void libipw_networks_initialize(struct libipw_device *ieee)INIT_LIST_HEAD (&ieee->network_free_list);INIT_LIST_HEAD (&ieee->network_list);for (i =0 ; i <MAX_NETWORK_COUNT ; i++) -list_add_tail (&ieee->networks[i].list, +list_add_tail (&ieee->networks[i]->list, &ieee->network_free_list); }
drivers/net/wireless/iwlwifi/iwl-3945.c +3 -3
@@ -184,7 +184,7 @@ static int iwl3945_hwrate_to_plcp_idx(u8 plcp) {int idx; -for (idx =0 ; idx <IWL_RATE_COUNT ; idx++) +for (idx =0 ; idx <IWL_RATE_COUNT_3945 ; idx++)if (iwl3945_rates[idx].plcp == plcp)return idx;return -1 ;
@@ -805,7 +805,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv, int sta_id, int tx_id) {u16 hw_value =ieee80211_get_tx_rate (priv->hw, info)->hw_value; -u16 rate_index =min (hw_value &0xffff ,IWL_RATE_COUNT -1 ); +u16 rate_index =min (hw_value &0xffff ,IWL_RATE_COUNT_3945 );u16 rate_mask;int rate;u8 rts_retry_limit;
@@ -2146,7 +2146,7 @@ static void iwl3945_hw_reg_init_channel_groups(struct iwl_priv *priv)/* fill in channel group's nominal powers for each rate */ for (rate_index =0 ; - rate_index <IWL_RATE_COUNT ; rate_index++, clip_pwrs++) { + rate_index <IWL_RATE_COUNT_3945 ; rate_index++, clip_pwrs++) {switch (rate_index) {case IWL_RATE_36M_INDEX_TABLE :if (i ==0 )/* B/G */
drivers/net/wireless/iwlwifi/iwl-agn.c +1 -1
@@ -2653,7 +2653,7 @@ static int iwl_mac_setup_register(struct iwl_priv *priv)*/ hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT ; - hw->wiphy->max_scan_ssids =PROBE_OPTION_MAX +1 ; + hw->wiphy->max_scan_ssids =PROBE_OPTION_MAX ;/* we create the 802.11 header and a zero-length SSID element */ hw->wiphy->max_scan_ie_len =IWL_MAX_PROBE_REQUEST -24 -2 ;
drivers/net/wireless/iwlwifi/iwl-scan.c +16 -33
62 lines not on this page · raw message
drivers/net/wireless/rt2x00/rt2x00soc.h +0 -2
@@ -26,8 +26,6 @@#ifndef RT2X00SOC_H #define RT2X00SOC_H -#define KSEG1ADDR (__ptr) __ptr -/* * SoC driver handlers. */
net/mac80211/debugfs_netdev.c +7 -3
@@ -48,20 +48,24 @@ static ssize_t ieee80211_if_write( ssize_t (*write)(struct ieee80211_sub_if_data *, const char *, int)) {u8 *buf; -ssize_t ret = -ENODEV ; +ssize_t ret; - buf =kzalloc (count,GFP_KERNEL ); + buf =kmalloc (count,GFP_KERNEL );if (!buf)return -ENOMEM ; + ret = -EFAULT ;if (copy_from_user (buf, userbuf, count)) -return -EFAULT ; + goto freebuf; + ret = -ENODEV ;rtnl_lock ();if (sdata->dev->reg_state ==NETREG_REGISTERED ) ret = (*write)(sdata, buf, count);rtnl_unlock (); +freebuf: +kfree (buf);return ret; }
net/mac80211/mlme.c +8 -5
@@ -436,10 +436,12 @@ static void ieee80211_enable_ps(struct ieee80211_local *local,if (local->hw.flags &IEEE80211_HW_PS_NULLFUNC_STACK )ieee80211_send_nullfunc (local, sdata,1 ); -if (!(local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS )) { - conf->flags |=IEEE80211_CONF_PS ; -ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_PS ); - } +if ((local->hw.flags &IEEE80211_HW_PS_NULLFUNC_STACK ) && + (local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS )) +return ; + + conf->flags |=IEEE80211_CONF_PS ; +ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_PS ); } }
@@ -558,7 +560,8 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) (!(ifmgd->flags & IEEE80211_STA_NULLFUNC_ACKED)))ieee80211_send_nullfunc (local, sdata,1 ); -if (!(local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS ) || +if (!((local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS ) && + (local->hw.flags &IEEE80211_HW_PS_NULLFUNC_STACK )) || (ifmgd->flags &IEEE80211_STA_NULLFUNC_ACKED )) { ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED ; local->hw.conf.flags |=IEEE80211_CONF_PS ;
net/mac80211/sta_info.c +1 -0
@@ -434,6 +434,7 @@ int sta_info_insert_rcu(struct sta_info *sta) __acquires(RCU)/* check if STA exists already */ if (sta_info_get_bss (sdata, sta->sta.addr)) {spin_unlock_irqrestore (&local->sta_lock, flags); +mutex_unlock (&local->sta_mtx);rcu_read_lock (); err = -EEXIST ; goto out_free;
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, 12 Mar 2010 15:28:48 -0500
Quoted 6 lines
Here is a round of fixes intended for 2.6.34. I don't think there is anything controversial here -- they are all reasonably small, targeted, and are fixes to real problems. I believe they are all well represented by their changelog entries as well.
Please let me know if there are problems!
Thanks John.
I'll pull this in after Linus pulls in my most recent pull request, in order to avoid confusion.