pull request: wireless-2.6 2009-04-29
Subsystems (4)
Dave,
Another round intended for 2.6.30. I think most of the fixes are self-explanatory (at least with their changelogs) this time (for a change)...please let me know if there are problems!
Thanks,
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/
---
The following changes since commit bf368e4e70cd4e0f880923c44e95a4273d725ab4:
Eric Dumazet (1):
net: Avoid extra wakeups of threads blocked in wait_for_packet()
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
Alan Jenkins (1):
mac80211: fix modprobe deadlock by not calling wep_init under rtnl_lock
Bob Copeland (1):
ath5k: fix buffer overrun in rate debug code
Johannes Berg (2):
iwlwifi: notify on scan completion even when shutting down
mac80211: default to automatic power control
Jussi Kivilinna (1):
rndis_wlan: fix initialization order for workqueue&workers
Stephen Rothwell (1):
wireless: remove unneeded EXPORT_SYMBOL the tickles a powerpc compiler bug
drivers/net/wireless/ath5k/debug.c | 2 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 4 ++-- drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 - drivers/net/wireless/rndis_wlan.c | 14 ++++++++++---- net/mac80211/main.c | 20 ++++++++++---------- 5 files changed, 23 insertions(+), 18 deletions(-)
drivers/net/wireless/ath5k/debug.c +1 -1
@@ -424,7 +424,7 @@ ath5k_debug_dump_bands(struct ath5k_softc *sc)for (b =0 ; b <IEEE80211_NUM_BANDS ; b++) {struct ieee80211_supported_band *band = &sc->sbands[b]; -char bname[5 ]; +char bname[6 ];switch (band->band) {case IEEE80211_BAND_2GHZ :strcpy (bname,"2 GHz" );
drivers/net/wireless/iwlwifi/iwl-scan.c +2 -2
@@ -925,11 +925,11 @@ void iwl_bg_scan_completed(struct work_struct *work)IWL_DEBUG_SCAN (priv,"SCAN complete scan\n" ); +ieee80211_scan_completed (priv->hw, false); +if (test_bit (STATUS_EXIT_PENDING , &priv->status))return ; -ieee80211_scan_completed (priv->hw, false); -/* Since setting the TXPOWER may have been deferred while * performing the scan, fire one off */ mutex_lock (&priv->mutex);
drivers/net/wireless/iwlwifi/iwl3945-base.c +0 -1
@@ -1694,7 +1694,6 @@ void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq) rxq->free_count =0 ;spin_unlock_irqrestore (&rxq->lock, flags); } -EXPORT_SYMBOL (iwl3945_rx_queue_reset);/* * this should be called while priv->lock is locked
drivers/net/wireless/rndis_wlan.c +10 -4
@@ -2558,6 +2558,11 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)mutex_init (&priv->command_lock);spin_lock_init (&priv->stats_lock); +/* because rndis_command() sleeps we need to use workqueue */ + priv->workqueue =create_singlethread_workqueue ("rndis_wlan" ); +INIT_WORK (&priv->work, rndis_wext_worker); +INIT_DELAYED_WORK (&priv->stats_work, rndis_update_wireless_stats); +/* try bind rndis_host */ retval =generic_rndis_bind (usbdev, intf,FLAG_RNDIS_PHYM_WIRELESS );if (retval <0 )
@@ -2603,16 +2608,17 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)disassociate (usbdev,1 );netif_carrier_off (usbdev->net); -/* because rndis_command() sleeps we need to use workqueue */ - priv->workqueue =create_singlethread_workqueue ("rndis_wlan" ); -INIT_DELAYED_WORK (&priv->stats_work, rndis_update_wireless_stats);queue_delayed_work (priv->workqueue, &priv->stats_work,round_jiffies_relative (STATS_UPDATE_JIFFIES )); -INIT_WORK (&priv->work, rndis_wext_worker);return 0 ; fail: +cancel_delayed_work_sync (&priv->stats_work); +cancel_work_sync (&priv->work); +flush_workqueue (priv->workqueue); +destroy_workqueue (priv->workqueue); +kfree (priv);return retval; }
net/mac80211/main.c +8 -7
@@ -757,6 +757,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, local->hw.conf.long_frame_max_tx_count =4 ; local->hw.conf.short_frame_max_tx_count =7 ; local->hw.conf.radio_enabled = true; + local->user_power_level =-1 ;INIT_LIST_HEAD (&local->interfaces);mutex_init (&local->iflist_mtx);
@@ -909,6 +910,13 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)if (result <0 ) goto fail_sta_info; + result =ieee80211_wep_init (local); +if (result <0 ) { +printk (KERN_DEBUG "%s: Failed to initialize wep: %d\n" , +wiphy_name (local->hw.wiphy), result); + goto fail_wep; + } +rtnl_lock (); result =dev_alloc_name (local->mdev, local->mdev->name);if (result <0 )
@@ -930,14 +938,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) goto fail_rate; } - result =ieee80211_wep_init (local); - -if (result <0 ) { -printk (KERN_DEBUG "%s: Failed to initialize wep: %d\n" , -wiphy_name (local->hw.wiphy), result); - goto fail_wep; - }
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Wed, 29 Apr 2009 18:31:12 -0400
Quoted 3 lines
Another round intended for 2.6.30. I think most of the fixes are self-explanatory (at least with their changelogs) this time (for a change)...please let me know if there are problems!
Pulled, thanks!
--
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