pull request: wireless-2.6 2010-06-08
Subsystems (5)
Dave,
Here is a flurry of fixes intended for 2.6.35. Most of them are small and obvious, but there are a few exceptions...I'll include some text from the iwlwifi pull request:
We include four fixes. This series includes the overdue 3945 fix to internal scanning. The system hang issue fixed by this patch is encountered by many people, see:
http://thread.gmane.org/gmane.linux.kernel/994562
http://thread.gmane.org/gmane.linux.kernel.wireless.general/51343
http://thread.gmane.org/gmane.linux.kernel.wireless.general/51614
http://thread.gmane.org/gmane.linux.kernel/992191/focus=51561
We include a second fix for iwl3945 that enables a workaround to detect and
recover when the command queue, or a transmit queue, becomes stuck. Unfortunately users seem to be running into this issue more frequently now.
The bugs related to this issue is noted in the commit message.
A third fix addresses a lockdep warning.
We also include an update to the MAINTAINERS file that we would like to include in 2.6.35 since Wey-Yi will be maintainer during this kernel's stabilization as well as thereafter.
The iwlwifi bits are bigger than I would like to see, but the fixes seem worthwhile. Also included is a revert of a hostap patch that introduced failures with some devices, a NULL pointer dereference fix, a memory leak fix, a fix for an incorrect check of function pointer, a USB ID for p54, and a fix for an association failure 'corner case' from Johannes.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 035320d54758e21227987e3aae0d46e7a04f4ddc:
Eric Dumazet (1):
ipmr: dont corrupt lists
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
Abhijeet Kolekar (1):
iwl3945: fix internal scan
Bob Copeland (1):
ath5k: retain promiscuous setting
Bruno Randolf (1):
ath5k: fix NULL pointer in antenna configuration
Emmanuel Grumbach (1):
iwlwifi: move sysfs_create_group to post request firmware
Grazvydas Ignotas (1):
wl1251: fix a memory leak in probe
Holger Schurig (1):
mac80211: fix function pointer check
Jason Dravet (1):
p54usb: Add device ID for Dell WLA3310 USB
Johannes Berg (3):
mac80211: process station blockack action frames from work
iwlwifi: add missing rcu_read_lock
mac80211: fix deauth before assoc
John W. Linville (1):
Revert "wireless: hostap, fix oops due to early probing interrupt"
Reinette Chatre (1):
iwl3945: enable stuck queue detection on 3945
Tobias Doerffel (1):
ath5k: depend on CONFIG_PM_SLEEP for suspend/resume functions
Wey-Yi Guy (1):
iwlwifi: add name to Maintainers list
Zhu Yi (1):
wireless: remove my name from the maintainer list
MAINTAINERS | 5 +- drivers/net/wireless/ath/ath5k/base.c | 12 +- drivers/net/wireless/ath/ath5k/phy.c | 7 + drivers/net/wireless/hostap/hostap_hw.c | 9 - drivers/net/wireless/iwlwifi/iwl-3945.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 30 +--- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 2 + drivers/net/wireless/iwlwifi/iwl-agn.c | 318 +++++++++++++------------- drivers/net/wireless/iwlwifi/iwl-core.c | 39 ++++ drivers/net/wireless/iwlwifi/iwl-core.h | 2 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 56 +++++- drivers/net/wireless/p54/p54usb.c | 1 + drivers/net/wireless/wl12xx/wl1251_sdio.c | 1 + net/mac80211/driver-ops.h | 2 +- net/mac80211/mlme.c | 92 +++++++- net/mac80211/rx.c | 3 + 16 files changed, 362 insertions(+), 218 deletions(-)
MAINTAINERS +1 -4
@@ -2966,7 +2966,6 @@ F: drivers/net/ixgb/ F: drivers/net/ixgbe/ INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT -M: Zhu Yi <[email protected]> M: Reinette Chatre <[email protected]> M: Intel Linux Wireless <ilw-VuQAYsv1563Yd54FQh9/[email protected]> L: [email protected]
@@ -2976,7 +2975,6 @@ F: Documentation/networking/README.ipw2100 F: drivers/net/wireless/ipw2x00/ipw2100.* INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT -M: Zhu Yi <[email protected]> M: Reinette Chatre <[email protected]> M: Intel Linux Wireless <ilw-VuQAYsv1563Yd54FQh9/[email protected]> L: [email protected]
@@ -3007,8 +3005,8 @@ F: drivers/net/wimax/i2400m/ F: include/linux/wimax/i2400m.h INTEL WIRELESS WIFI LINK (iwlwifi) -M: Zhu Yi <[email protected]> M: Reinette Chatre <[email protected]> +M: Wey-Yi Guy <[email protected]> M: Intel Linux Wireless <ilw-VuQAYsv1563Yd54FQh9/[email protected]> L: [email protected] W: http://intellinuxwireless.org
@@ -3018,7 +3016,6 @@ F: drivers/net/wireless/iwlwifi/ INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi) M: Samuel Ortiz <[email protected]> -M: Zhu Yi <[email protected]> M: Intel Linux Wireless <ilw-VuQAYsv1563Yd54FQh9/[email protected]> L: [email protected] S: Supported
drivers/net/wireless/ath/ath5k/base.c +7 -5
@@ -195,7 +195,7 @@ static const struct ieee80211_rate ath5k_rates[] = {static int __devinit ath5k_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id); static void __devexit ath5k_pci_remove(struct pci_dev *pdev); -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int ath5k_pci_suspend (struct device *dev);static int ath5k_pci_resume (struct device *dev);
@@ -203,7 +203,7 @@ static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume);#define ATH5K_PM_OPS (&ath5k_pm_ops)#else #define ATH5K_PM_OPS NULL -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ static struct pci_driver ath5k_pci_driver = { .name =KBUILD_MODNAME ,
@@ -708,7 +708,7 @@ ath5k_pci_remove(struct pci_dev *pdev)ieee80211_free_hw (hw); } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int ath5k_pci_suspend (struct device *dev) {struct ieee80211_hw *hw =pci_get_drvdata (to_pci_dev (dev));
@@ -734,7 +734,7 @@ static int ath5k_pci_resume(struct device *dev)ath5k_led_enable (sc); return 0; } -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ /***********************\
@@ -3140,13 +3140,15 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,if (changed_flags & (FIF_PROMISC_IN_BSS |FIF_OTHER_BSS )) {if (*new_flags &FIF_PROMISC_IN_BSS ) { - rfilt |=AR5K_RX_FILTER_PROM ;__set_bit (ATH_STAT_PROMISC , sc->status); }else {__clear_bit (ATH_STAT_PROMISC , sc->status); } } +if (test_bit (ATH_STAT_PROMISC , sc->status)) + rfilt |=AR5K_RX_FILTER_PROM ; +/* Note, AR5K_RX_FILTER_MCAST is already enabled */ if (*new_flags &FIF_ALLMULTI ) { mfilt[0 ] = ~0 ;
drivers/net/wireless/ath/ath5k/phy.c +7 -0
@@ -1814,6 +1814,13 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)u8 def_ant, tx_ant, ee_mode;u32 sta_id1 =0 ; +/* if channel is not initialized yet we can't set the antennas +* so just store the mode. it will be set on the next reset */ +if (channel ==NULL ) { + ah->ah_ant_mode = ant_mode; +return ; + } + def_ant = ah->ah_def_ant;ATH5K_TRACE (ah->ah_sc);
drivers/net/wireless/hostap/hostap_hw.c +0 -9
@@ -2618,15 +2618,6 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)int events =0 ;u16 ev; -/* Detect early interrupt before driver is fully configued */ -if (!dev->base_addr) { -if (net_ratelimit ()) { -printk (KERN_DEBUG "%s: Interrupt, but dev not configured\n" , - dev->name); - } -return IRQ_HANDLED ; - } - iface =netdev_priv (dev); local = iface->local;
drivers/net/wireless/iwlwifi/iwl-3945.c +1 -0
@@ -2852,6 +2852,7 @@ static struct iwl_lib_ops iwl3945_lib = { .isr = iwl_isr_legacy, .config_ap = iwl3945_config_ap, .manage_ibss_station = iwl3945_manage_ibss_station, + .recover_from_tx_stall = iwl_bg_monitor_recover, .check_plcp_health = iwl3945_good_plcp_health, .debugfs_ops = {
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +2 -28
@@ -1119,10 +1119,9 @@ static int iwl_get_single_channel_for_scan(struct iwl_priv *priv, struct iwl_scan_channel *scan_ch) {const struct ieee80211_supported_band *sband; -const struct iwl_channel_info *ch_info;u16 passive_dwell =0 ;u16 active_dwell =0 ; -int i, added =0 ; +int added =0 ;u16 channel =0 ; sband =iwl_get_hw_mode (priv, band);
@@ -1137,32 +1136,7 @@ static int iwl_get_single_channel_for_scan(struct iwl_priv *priv,if (passive_dwell <= active_dwell) passive_dwell = active_dwell +1 ; -/* only scan single channel, good enough to reset the RF */ -/* pick the first valid not in-use channel */ -if (band ==IEEE80211_BAND_5GHZ ) { -for (i =14 ; i < priv->channel_count; i++) { -if (priv->channel_info[i].channel != -le16_to_cpu (priv->staging_rxon.channel)) { - channel = priv->channel_info[i].channel; - ch_info =iwl_get_channel_info (priv, - band, channel); -if (is_channel_valid (ch_info)) -break ; - } - } - }else { -for (i =0 ; i <14 ; i++) { -if (priv->channel_info[i].channel != -le16_to_cpu (priv->staging_rxon.channel)) { - channel = - priv->channel_info[i].channel; - ch_info =iwl_get_channel_info (priv, - band, channel); -if (is_channel_valid (ch_info)) -break ; - } - } - } + channel =iwl_get_single_channel_number (priv, band);if (channel) { scan_ch->channel =cpu_to_le16 (channel); scan_ch->type =SCAN_CHANNEL_TYPE_PASSIVE ;
drivers/net/wireless/iwlwifi/iwl-agn-tx.c +2 -0
@@ -1125,6 +1125,7 @@ static void iwlagn_tx_status(struct iwl_priv *priv, struct sk_buff *skb)struct ieee80211_sta *sta;struct iwl_station_priv *sta_priv; +rcu_read_lock (); sta =ieee80211_find_sta (priv->vif, hdr->addr1);if (sta) { sta_priv = (void *)sta->drv_priv;
@@ -1133,6 +1134,7 @@ static void iwlagn_tx_status(struct iwl_priv *priv, struct sk_buff *skb) atomic_dec_return(&sta_priv->pending_frames) == 0)ieee80211_sta_block_awake (priv->hw, sta, false); } +rcu_read_unlock ();ieee80211_tx_status_irqsafe (priv->hw, skb); }
drivers/net/wireless/iwlwifi/iwl-agn.c +159 -159
359 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-core.c +39 -0
@@ -854,6 +854,45 @@ void iwl_set_rxon_chain(struct iwl_priv *priv) }EXPORT_SYMBOL (iwl_set_rxon_chain); +/* Return valid channel */ +u8 iwl_get_single_channel_number (struct iwl_priv *priv, +enum ieee80211_band band) +{ +const struct iwl_channel_info *ch_info; +int i; +u8 channel =0 ; + +/* only scan single channel, good enough to reset the RF */ +/* pick the first valid not in-use channel */ +if (band ==IEEE80211_BAND_5GHZ ) { +for (i =14 ; i < priv->channel_count; i++) { +if (priv->channel_info[i].channel != +le16_to_cpu (priv->staging_rxon.channel)) { + channel = priv->channel_info[i].channel; + ch_info =iwl_get_channel_info (priv, + band, channel); +if (is_channel_valid (ch_info)) +break ; + } + } + }else { +for (i =0 ; i <14 ; i++) { +if (priv->channel_info[i].channel != +le16_to_cpu (priv->staging_rxon.channel)) { + channel = + priv->channel_info[i].channel; + ch_info =iwl_get_channel_info (priv, + band, channel); +if (is_channel_valid (ch_info)) +break ; + } + } + } + +return channel; +} +EXPORT_SYMBOL (iwl_get_single_channel_number); +/** * iwl_set_rxon_channel - Set the phymode and channel values in staging RXON * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
drivers/net/wireless/iwlwifi/iwl-core.h +2 -0
@@ -343,6 +343,8 @@ int iwl_check_rxon_cmd(struct iwl_priv *priv);int iwl_full_rxon_required (struct iwl_priv *priv);void iwl_set_rxon_chain (struct iwl_priv *priv);int iwl_set_rxon_channel (struct iwl_priv *priv,struct ieee80211_channel *ch); +u8 iwl_get_single_channel_number (struct iwl_priv *priv, +enum ieee80211_band band);void iwl_set_rxon_ht (struct iwl_priv *priv,struct iwl_ht_config *ht_conf);u8 iwl_is_ht40_tx_allowed (struct iwl_priv *priv,struct ieee80211_sta_ht_cap *sta_ht_inf);
drivers/net/wireless/iwlwifi/iwl3945-base.c +53 -3
68 lines not on this page · raw message
drivers/net/wireless/p54/p54usb.c +1 -0
@@ -80,6 +80,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { {USB_DEVICE(0x1413, 0x5400)}, /* Telsey 802.11g USB2.0 Adapter */ {USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */ {USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */ + {USB_DEVICE(0x413c, 0x5513)}, /* Dell WLA3310 USB Wireless Adapter */ {USB_DEVICE(0x413c, 0x8102)}, /* Spinnaker DUT */ {USB_DEVICE(0x413c, 0x8104)}, /* Cohiba Proto board */ {}
drivers/net/wireless/wl12xx/wl1251_sdio.c +1 -0
@@ -259,6 +259,7 @@ disable:sdio_disable_func (func); release:sdio_release_host (func); +wl1251_free_hw (wl);return ret; }
net/mac80211/driver-ops.h +1 -1
@@ -349,7 +349,7 @@ static inline int drv_get_survey(struct ieee80211_local *local, int idx, struct survey_info *survey) {int ret = -EOPNOTSUPP ; -if (local->ops->conf_tx) +if (local->ops->get_survey) ret = local->ops->get_survey (&local->hw, idx, survey);/* trace_drv_get_survey(local, idx, survey, ret); */ return ret;
net/mac80211/mlme.c +83 -9
106 lines not on this page · raw message
net/mac80211/rx.c +3 -0
@@ -1944,6 +1944,9 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)if (len <IEEE80211_MIN_ACTION_SIZE +1 )break ; +if (sdata->vif.type ==NL80211_IFTYPE_STATION ) +return ieee80211_sta_rx_mgmt (sdata, rx->skb); +switch (mgmt->u.action.u.addba_req.action_code) {case WLAN_ACTION_ADDBA_REQ : if (len < (IEEE80211_MIN_ACTION_SIZE +
Signature · 6 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Tue, 8 Jun 2010 15:02:14 -0400
Quoted 5 lines
Dave,
Here is a flurry of fixes intended for 2.6.35. Most of them are small and obvious, but there are a few exceptions...I'll include some text from the iwlwifi pull request:
...
Quoted 6 lines
The iwlwifi bits are bigger than I would like to see, but the fixes seem worthwhile. Also included is a revert of a hostap patch that introduced failures with some devices, a NULL pointer dereference fix, a memory leak fix, a fix for an incorrect check of function pointer, a USB ID for p54, and a fix for an association failure 'corner case' from Johannes.
Pulled, thanks John.
Please try to keep things a lot smaller from here on out, thank you.