pull request: wireless 2013-05-10
Subsystems (5)
Dave,
Here is a batch of fixes intended for the 3.10 stream.
Amitkumar Karwar provides an mwifiex fix to plug a memory leak when the driver is unloaded.
Bing Zhao brings an mwifiex fix for some flag handling that leads to log spam and an unusable interface.
Daniel Drake offers an mwifiex fix for multicast filter setup, to correctly implement wakeup behaviour for multicast WOL.
Felix Fietkau fixes an ath9k problem that produces logspam and keycache errors due to a bad return code.
Stanislaw Gruszka produces an fix for a WARNING from ath5k, and an iwl4965 workaround to stop advertising a feature that doesn't work with the current mac80211 implementation.
Sujith Manoharan gives us an ath9k fix to reprogram the HW beacon timers after a TSF update, and an initvals fix for the AR9565 device.
Thommy Jakobsson fixes an rx descriptor underrun on b43.
Please let me know if there are problems!
John
---
The following changes since commit 70eba4226d9718946941c7be0c8cb66d431e7686:
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (2013-05-09 16:42:10 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 4f81d715b90b7ebe049dd906511c47956086ad44:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-05-10 10:29:24 -0400)
----------------------------------------------------------------
Amitkumar Karwar (1):
mwifiex: fix memory leak issue when driver unload
Bing Zhao (1):
mwifiex: clear is_suspended flag when interrupt is received early
Daniel Drake (1):
mwifiex: fix setting of multicast filter
Felix Fietkau (1):
ath9k: fix key allocation error handling for powersave keys
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Stanislaw Gruszka (2):
ath5k: do not reschedule tx_complete_work on stop
iwl4965: workaround connection regression on passive channel
Sujith Manoharan (2):
ath9k: Fix beacon reconfiguration
ath9k: Update initvals for AR9565
Thommy Jakobsson (1):
B43: Handle DMA RX descriptor underrun
drivers/net/wireless/ath/ath5k/base.c | 5 + .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 138 +++++++++++---------- drivers/net/wireless/ath/ath9k/main.c | 10 +- drivers/net/wireless/b43/dma.c | 19 +++ drivers/net/wireless/b43/dma.h | 4 +- drivers/net/wireless/b43/main.c | 43 +++---- drivers/net/wireless/iwlegacy/4965-mac.c | 3 +- drivers/net/wireless/mwifiex/cfg80211.c | 3 - drivers/net/wireless/mwifiex/cmdevt.c | 1 + drivers/net/wireless/mwifiex/main.c | 1 + drivers/net/wireless/mwifiex/sta_ioctl.c | 21 +--- 11 files changed, 131 insertions(+), 117 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +5 -0
@@ -2369,6 +2369,9 @@ ath5k_tx_complete_poll_work(struct work_struct *work)int i;bool needreset = false; +if (!test_bit (ATH_STAT_STARTED , ah->status)) +return ; +mutex_lock (&ah->lock);for (i =0 ; i <ARRAY_SIZE (ah->txqs); i++) {
@@ -2676,6 +2679,7 @@ done:mmiowb ();mutex_unlock (&ah->lock); +set_bit (ATH_STAT_STARTED , ah->status);ieee80211_queue_delayed_work (ah->hw, &ah->tx_complete_work,msecs_to_jiffies (ATH5K_TX_COMPLETE_POLL_INT ));
@@ -2737,6 +2741,7 @@ void ath5k_stop(struct ieee80211_hw *hw)ath5k_stop_tasklets (ah); +clear_bit (ATH_STAT_STARTED , ah->status);cancel_delayed_work_sync (&ah->tx_complete_work);if (!ath5k_modparam_no_hw_rfkill_switch)
drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h +70 -68
210 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/main.c +7 -3
@@ -227,13 +227,13 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)if (!test_bit (SC_OP_BEACONS , &sc->sc_flags)) goto work; -ath9k_set_beacon (sc); -if (ah->opmode ==NL80211_IFTYPE_STATION &&test_bit (SC_OP_PRIM_STA_VIF , &sc->sc_flags)) {spin_lock_irqsave (&sc->sc_pm_lock, flags); sc->ps_flags |=PS_BEACON_SYNC |PS_WAIT_FOR_BEACON ;spin_unlock_irqrestore (&sc->sc_pm_lock, flags); + }else { +ath9k_set_beacon (sc); } work:ath_restart_work (sc);
@@ -1332,6 +1332,7 @@ static int ath9k_sta_add(struct ieee80211_hw *hw,struct ath_common *common =ath9k_hw_common (sc->sc_ah);struct ath_node *an = (struct ath_node *) sta->drv_priv;struct ieee80211_key_conf ps_key = { }; +int key;ath_node_attach (sc, sta, vif);
@@ -1339,7 +1340,9 @@ static int ath9k_sta_add(struct ieee80211_hw *hw, vif->type != NL80211_IFTYPE_AP_VLAN)return 0 ; - an->ps_key =ath_key_config (common, vif, sta, &ps_key); + key =ath_key_config (common, vif, sta, &ps_key); +if (key >0 ) + an->ps_key = key;return 0 ; }
@@ -1356,6 +1359,7 @@ static void ath9k_del_ps_key(struct ath_softc *sc,return ;ath_key_delete (common, &ps_key); + an->ps_key =0 ; } static int ath9k_sta_remove(struct ieee80211_hw *hw,
drivers/net/wireless/b43/dma.c +19 -0
@@ -1728,6 +1728,25 @@ drop_recycle_buffer:sync_descbuffer_for_device (ring, dmaaddr, ring->rx_buffersize); } +void b43_dma_handle_rx_overflow (struct b43_dmaring *ring) +{ +int current_slot, previous_slot; + +B43_WARN_ON (ring->tx); + +/* Device has filled all buffers, drop all packets and let TCP +* decrease speed. +* Decrement RX index by one will let the device to see all slots +* as free again +*/ +/* +*TODO: How to increase rx_drop in mac80211? +*/ + current_slot = ring->ops->get_current_rxslot (ring); + previous_slot =prev_slot (ring, current_slot); + ring->ops->set_current_rxslot (ring, previous_slot); +} +void b43_dma_rx (struct b43_dmaring *ring) {const struct b43_dma_ops *ops = ring->ops;
drivers/net/wireless/b43/dma.h +3 -1
@@ -9,7 +9,7 @@/* DMA-Interrupt reasons. */ #define B43_DMAIRQ_FATALMASK ((1 << 10) | (1 << 11) | (1 << 12) \ | (1 << 14) | (1 << 15)) -#define B43_DMAIRQ_NONFATALMASK (1 << 13) +#define B43_DMAIRQ_RDESC_UFLOW (1 << 13)#define B43_DMAIRQ_RX_DONE (1 << 16)/*** 32-bit DMA Engine. ***/
@@ -295,6 +295,8 @@ int b43_dma_tx(struct b43_wldev *dev,void b43_dma_handle_txstatus (struct b43_wldev *dev,const struct b43_txstatus *status); +void b43_dma_handle_rx_overflow (struct b43_dmaring *ring); +void b43_dma_rx (struct b43_dmaring *ring); void b43_dma_direct_fifo_rx(struct b43_wldev *dev,
drivers/net/wireless/b43/main.c +18 -25
68 lines not on this page · raw message
drivers/net/wireless/iwlegacy/4965-mac.c +1 -2
@@ -5741,8 +5741,7 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length) hw->flags =IEEE80211_HW_SIGNAL_DBM |IEEE80211_HW_AMPDU_AGGREGATION |IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |IEEE80211_HW_SPECTRUM_MGMT | -IEEE80211_HW_REPORTS_TX_ACK_STATUS |IEEE80211_HW_SUPPORTS_PS | -IEEE80211_HW_SUPPORTS_DYNAMIC_PS ; +IEEE80211_HW_SUPPORTS_PS |IEEE80211_HW_SUPPORTS_DYNAMIC_PS ;if (il->cfg->sku &IL_SKU_N ) hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
drivers/net/wireless/mwifiex/cfg80211.c +0 -3
@@ -2234,9 +2234,6 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)if (wdev->netdev->reg_state ==NETREG_REGISTERED )unregister_netdevice (wdev->netdev); -if (wdev->netdev->reg_state ==NETREG_UNREGISTERED ) -free_netdev (wdev->netdev); -/* Clear the priv in adapter */ priv->netdev =NULL ;
drivers/net/wireless/mwifiex/cmdevt.c +1 -0
@@ -1191,6 +1191,7 @@ mwifiex_process_hs_config(struct mwifiex_adapter *adapter) adapter->if_ops.wakeup (adapter); adapter->hs_activated = false; adapter->is_hs_configured = false; + adapter->is_suspended = false;mwifiex_hs_activated_event (mwifiex_get_priv (adapter,MWIFIEX_BSS_ROLE_ANY ), false);
drivers/net/wireless/mwifiex/main.c +1 -0
@@ -655,6 +655,7 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv, struct net_device *dev) { dev->netdev_ops = &mwifiex_netdev_ops; + dev->destructor = free_netdev;/* Initialize private structure */ priv->current_key_index =0 ; priv->media_connected = false;
drivers/net/wireless/mwifiex/sta_ioctl.c +6 -15
@@ -96,7 +96,7 @@ int mwifiex_request_set_multicast_list(struct mwifiex_private *priv, }else {/* Multicast */ priv->curr_pkt_filter &= ~HostCmd_ACT_MAC_PROMISCUOUS_ENABLE; -if (mcast_list->mode ==MWIFIEX_MULTICAST_MODE ) { +if (mcast_list->mode ==MWIFIEX_ALL_MULTI_MODE ) {dev_dbg (priv->adapter->dev,"info: Enabling All Multicast!\n" ); priv->curr_pkt_filter |=
@@ -108,20 +108,11 @@ int mwifiex_request_set_multicast_list(struct mwifiex_private *priv,dev_dbg (priv->adapter->dev,"info: Set multicast list=%d\n" , mcast_list->num_multicast_addr); -/* Set multicast addresses to firmware */ -if (old_pkt_filter == priv->curr_pkt_filter) { -/* Send request to firmware */ - ret =mwifiex_send_cmd_async (priv, - HostCmd_CMD_MAC_MULTICAST_ADR, - HostCmd_ACT_GEN_SET,0 , - mcast_list); - }else { -/* Send request to firmware */ - ret =mwifiex_send_cmd_async (priv, - HostCmd_CMD_MAC_MULTICAST_ADR, - HostCmd_ACT_GEN_SET,0 , - mcast_list); - } +/* Send multicast addresses to firmware */ + ret =mwifiex_send_cmd_async (priv, + HostCmd_CMD_MAC_MULTICAST_ADR, + HostCmd_ACT_GEN_SET,0 , + mcast_list); } } }
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, 10 May 2013 11:22:02 -0400
Quoted 1 line
Here is a batch of fixes intended for the 3.10 stream.
...
Quoted 1 line
Please let me know if there are problems!
...
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.gitfor-davem
Pulled, thanks John!