pull request: wireless 2012-02-08
Subsystems (5)
commit 7a73b08b50b075b114d0f608099e4634f9c73ae7
Dave,
This is a batch of fixes intended for 3.3.
Included is a fix for an association failure bug with mwifiex, and a fix for a NULL pointer deref in that same driver. There is also an ath9k fix for a WEP-related regression, and another ath9k fix for an RTS/CTS timeout regression. A third ath9k fix address an oops during driver initialization. Also included is a zd1211rw fix for an issue where the firmware would corrupt the duration_id setting and cause devices to be unable to connect to zd1211rw-based APs. A fix from me to reduce some log spam from ath9k rounds-out the bunch.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit a1728800bed3b93b231d99e97c756f622b9991c2:
net: enable TC35815 for MIPS again (2012-02-07 13:40:44 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
Amitkumar Karwar (2):
mwifiex: handle association failure case correctly
mwifiex: add NULL checks in driver unload path
Felix Fietkau (2):
ath9k: fix a WEP crypto related regression
ath9k_hw: fix a RTS/CTS timeout regression
Henrik Rydberg (1):
bcma: don't fail for bad SPROM CRC
John W. Linville (2):
ath9k: use WARN_ON_ONCE in ath_rc_get_highest_rix
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Mohammed Shafi Shajakhan (1):
ath9k: Fix kernel panic during driver initilization
Tomas Vanek (1):
zd1211rw: firmware needs duration_id set to zero for non-pspoll frames
drivers/bcma/main.c | 4 +--- drivers/net/wireless/ath/ath9k/hw.c | 7 +++++-- drivers/net/wireless/ath/ath9k/init.c | 9 +++++---- drivers/net/wireless/ath/ath9k/rc.c | 2 +- drivers/net/wireless/ath/ath9k/recv.c | 8 ++++++++ drivers/net/wireless/mwifiex/init.c | 3 ++- drivers/net/wireless/mwifiex/main.c | 12 ++++++++---- drivers/net/wireless/mwifiex/sta_ioctl.c | 8 +++++++- drivers/net/wireless/zd1211rw/zd_mac.c | 8 ++++++++ 9 files changed, 45 insertions(+), 16 deletions(-)
drivers/bcma/main.c +1 -3
@@ -169,10 +169,8 @@ int bcma_bus_register(struct bcma_bus *bus) err =bcma_sprom_get (bus);if (err == -ENOENT ) {pr_err ("No SPROM available\n" ); - }else if (err) { + }else if (err)pr_err ("Failed to get SPROM: %d\n" , err); -return -ENOENT ; - }/* Register found cores */ bcma_register_cores (bus);
drivers/net/wireless/ath/ath9k/hw.c +5 -2
@@ -1037,13 +1037,16 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)/* * Workaround for early ACK timeouts, add an offset to match the -* initval's 64us ack timeout value. +* initval's 64us ack timeout value. Use 48us for the CTS timeout. * This was initially only meant to work around an issue with delayed * BA frames in some implementations, but it has been found to fix ACK * timeout issues in other cases as well. */ -if (conf->channel && conf->channel->band ==IEEE80211_BAND_2GHZ ) +if (conf->channel && conf->channel->band ==IEEE80211_BAND_2GHZ ) { acktimeout +=64 - sifstime - ah->slottime; + ctstimeout +=48 - sifstime - ah->slottime; + } +ath9k_hw_set_sifs_time (ah, sifstime);ath9k_hw_setslottime (ah, slottime);
drivers/net/wireless/ath/ath9k/init.c +5 -4
@@ -822,6 +822,11 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, ARRAY_SIZE(ath9k_tpt_blink));#endif +INIT_WORK (&sc->hw_reset_work, ath_reset_work); +INIT_WORK (&sc->hw_check_work, ath_hw_check); +INIT_WORK (&sc->paprd_work, ath_paprd_calibrate); +INIT_DELAYED_WORK (&sc->hw_pll_work, ath_hw_pll_work); +/* Register with mac80211 */ error =ieee80211_register_hw (hw);if (error)
@@ -840,10 +845,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, goto error_world; } -INIT_WORK (&sc->hw_reset_work, ath_reset_work); -INIT_WORK (&sc->hw_check_work, ath_hw_check); -INIT_WORK (&sc->paprd_work, ath_paprd_calibrate); -INIT_DELAYED_WORK (&sc->hw_pll_work, ath_hw_pll_work); sc->last_rssi =ATH_RSSI_DUMMY_MARKER ;ath_init_leds (sc);
drivers/net/wireless/ath/ath9k/rc.c +1 -1
@@ -694,7 +694,7 @@ static u8 ath_rc_get_highest_rix(struct ath_softc *sc,return rate;/* This should not happen */ -WARN_ON (1 ); +WARN_ON_ONCE (1 ); rate = ath_rc_priv->valid_rate_index[0 ];
drivers/net/wireless/ath/ath9k/recv.c +8 -0
@@ -822,6 +822,14 @@ static bool ath9k_rx_accept(struct ath_common *common, (ATH9K_RXERR_DECRYPT |ATH9K_RXERR_CRC |ATH9K_RXERR_MIC | ATH9K_RXERR_KEYMISS)); +/* +* Key miss events are only relevant for pairwise keys where the +* descriptor does contain a valid key index. This has been observed +* mostly with CCMP encryption. +*/ +if (rx_stats->rs_keyix ==ATH9K_RXKEYIX_INVALID ) + rx_stats->rs_status &= ~ATH9K_RXERR_KEYMISS ; +if (!rx_stats->rs_datalen)return false;/*
drivers/net/wireless/mwifiex/init.c +2 -1
@@ -382,7 +382,8 @@ mwifiex_free_adapter(struct mwifiex_adapter *adapter) adapter->if_ops.cleanup_if (adapter); -dev_kfree_skb_any (adapter->sleep_cfm); +if (adapter->sleep_cfm) +dev_kfree_skb_any (adapter->sleep_cfm); }/*
drivers/net/wireless/mwifiex/main.c +8 -4
@@ -822,7 +822,9 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)continue ;rtnl_lock (); -mwifiex_del_virtual_intf (priv->wdev->wiphy, priv->netdev); +if (priv->wdev && priv->netdev) +mwifiex_del_virtual_intf (priv->wdev->wiphy, + priv->netdev);rtnl_unlock (); }
@@ -830,9 +832,11 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)if (!priv) goto exit_remove; -wiphy_unregister (priv->wdev->wiphy); -wiphy_free (priv->wdev->wiphy); -kfree (priv->wdev); +if (priv->wdev) { +wiphy_unregister (priv->wdev->wiphy); +wiphy_free (priv->wdev->wiphy); +kfree (priv->wdev); + }mwifiex_terminate_workqueue (adapter);
drivers/net/wireless/mwifiex/sta_ioctl.c +7 -1
@@ -54,7 +54,7 @@ int mwifiex_copy_mcast_addr(struct mwifiex_multicast_list *mlist,int mwifiex_wait_queue_complete (struct mwifiex_adapter *adapter) {bool cancel_flag = false; -int status = adapter->cmd_wait_q.status; +int status;struct cmd_ctrl_node *cmd_queued;if (!adapter->cmd_queued)
@@ -79,6 +79,8 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)mwifiex_cancel_pending_ioctl (adapter);dev_dbg (adapter->dev,"cmd cancel\n" ); } + + status = adapter->cmd_wait_q.status; adapter->cmd_wait_q.status =0 ;return status;
@@ -240,6 +242,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,if (!netif_queue_stopped (priv->netdev))mwifiex_stop_net_dev_queue (priv->netdev, adapter); +if (netif_carrier_ok (priv->netdev)) +netif_carrier_off (priv->netdev);/* Clear any past association response stored for * application retrieval */
@@ -271,6 +275,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,if (!netif_queue_stopped (priv->netdev))mwifiex_stop_net_dev_queue (priv->netdev, adapter); +if (netif_carrier_ok (priv->netdev)) +netif_carrier_off (priv->netdev);if (!ret) { dev_dbg(adapter->dev, "info: network found in scan"
drivers/net/wireless/zd1211rw/zd_mac.c +8 -0
@@ -866,6 +866,14 @@ static int fill_ctrlset(struct zd_mac *mac,ZD_ASSERT (frag_len <=0xffff ); +/* +* Firmware computes the duration itself (for all frames except PSPoll) +* and needs the field set to 0 at input, otherwise firmware messes up +* duration_id and sets bits 14 and 15 on. +*/ +if (!ieee80211_is_pspoll (hdr->frame_control)) + hdr->duration_id =0 ; + txrate =ieee80211_get_tx_rate (mac->hw, info); cs->modulation = txrate->hw_value;
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: Wed, 8 Feb 2012 15:37:02 -0500
Quoted 11 lines
This is a batch of fixes intended for 3.3.
Included is a fix for an association failure bug with mwifiex, and a fix for a NULL pointer deref in that same driver. There is also an ath9k fix for a WEP-related regression, and another ath9k fix for an RTS/CTS timeout regression. A third ath9k fix address an oops during driver initialization. Also included is a zd1211rw fix for an issue where the firmware would corrupt the
duration_idsetting and cause devices to be unable to connect to zd1211rw-based APs. A fix from me to reduce some log spam from ath9k rounds-out the bunch.
Quoted 1 line
Please let me know if there are problems!
Pulled, thanks John.