pull request: wireless 2013-05-20
Subsystems (7)
Dave,
This pull request is intended for the 3.10 series. It contains a variety of fixes for problems discovered during the merge window and after 3.10-rc1.
For the mac80211 bits, Johannes says the following:
"This is what I have:
* a patch from Felix to fix RCU usage in his rate table code
* a patch from Ilan to add the wdev id to some notifications so they can actually be used by userspace
* Sasha Levin found an issue in how hwsim handles devices
* a fix for a bug in the wiphy_register() error path that's been there forever
* three fixes for WoWLAN
* AP mode frame matching was erroneously giving frames to all virtual AP interfaces (reported by Jouni)
* a fix for HT handling in my CSA changes, found by Sujith
* a fix for some locking simplifications gone wrong
* Ben Greear found more cfg80211/mac80211 state confusion
* and a fix for another bug found by Jouni: local state changes need to be reported by mac80211 to cfg80211 so it disconnects properly."
And for the iwlwifi bits, he says:
"I have fixes for a firmware crash during resume, multicast RX, aggregation and a workaround for a firmware scanning bug."
Along with those...
Albert Pool adds a USB ID to the rtl8192cu driver.
Arend van Spriel restores a driver option support flag that had been removed from 3.9 due to a bug in that version of the driver.
Felix Fietkau fixes a trio of ath9k issues with a series of small patches.
Geert Uytterhoeven provides a Kconfig fix for ath9k (which you also merged, so it isn't in the diff here).
Larry Finger gives us a fix for a build warning on big-endian systems for rtlwifi.
Rafał Miłecki adds some core IDs to the bcma driver.
Sujith Manoharan fixes a module unloading crash in ath9k, and corrects some calibration settings for AR9485.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 057cf65e4f715f62acccbd9125cf63eddfe69d30:
bnx2x: Fix GSO for 57710/57711 chips (2013-05-20 00:56:57 -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 ba7c96bec59d1c11cf9eaf6489e70e22f53da31b:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-05-20 15:19:01 -0400)
----------------------------------------------------------------
Albert Pool (1):
rtlwifi: rtl8192cu: Add new USB ID
Alexander Bondar (1):
iwlwifi: mvm: Prevent setting assoc flag in MAC_CONTEXT_CMD
Arend van Spriel (1):
brcmfmac: announce P2P_DEVICE support in wiphy structure
Denis Efremov (1):
iwlegacy: remove inline marking of EXPORT_SYMBOL functions
Emmanuel Grumbach (2):
iwlwifi: mvm: tell firmware to let multicast frames in
iwlwifi: mvm: fix aggregation drain flow
Felix Fietkau (4):
mac80211: fix spurious RCU warning and update documentation
ath9k: fix aggregation stop/flush handling
ath9k: fix rate handling/reporting
ath9k: fix draining aggregation tid buffers
Geert Uytterhoeven (1):
net/wireless: ATH9K should depend on HAS_DMA
Ilan Peer (2):
nl80211: Add wdev identifier to some nl80211 notifications
iwlwifi: mvm: Always use SCAN_TYPE_FORCED
Johannes Berg (9):
cfg80211: fix wiphy_register error path
cfg80211: fix WoWLAN wakeup tracing
mac80211: fix IEEE80211_SDATA_DISCONNECT_RESUME
mac80211: fix HT beacon-based channel switch handling
mac80211: use just spin_lock() in ieee80211_get_tkip_p2k()
mac80211: fix AP-mode frame matching
cfg80211: fix interface down/disconnect state handling
mac80211: report deauth to cfg80211 for local state change
cfg80211: fix sending WoWLAN TCP wakeup settings
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Larry Finger (1):
rtlwifi: rtl8188ee: Fix warning when building on big-endian systems
Rafał Miłecki (1):
bcma: add more core IDs
Sasha Levin (1):
mac80211_hwsim: correctly register the platform driver
Sujith Manoharan (2):
ath9k: Fix crash on module unload
ath9k_hw: Enable manual peak calibration for AR9485
drivers/bcma/scan.c | 2 + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 +- drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 2 +- drivers/net/wireless/ath/ath9k/ath9k.h | 4 +- drivers/net/wireless/ath/ath9k/debug.c | 8 +++ drivers/net/wireless/ath/ath9k/debug.h | 5 ++ drivers/net/wireless/ath/ath9k/init.c | 10 ++- drivers/net/wireless/ath/ath9k/main.c | 8 ++- drivers/net/wireless/ath/ath9k/xmit.c | 74 ++++++++++++++-------- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 7 +- drivers/net/wireless/iwlegacy/common.c | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 27 ++++++++ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 12 ++-- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 17 ++++- drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 + drivers/net/wireless/iwlwifi/mvm/ops.c | 1 + drivers/net/wireless/iwlwifi/mvm/scan.c | 6 ++ drivers/net/wireless/iwlwifi/mvm/sta.c | 13 +++- drivers/net/wireless/iwlwifi/mvm/sta.h | 2 - drivers/net/wireless/iwlwifi/mvm/tx.c | 48 ++++++++++---- drivers/net/wireless/mac80211_hwsim.c | 18 +++--- drivers/net/wireless/rtlwifi/rtl8188ee/trx.h | 4 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + include/linux/bcma/bcma.h | 5 +- include/net/mac80211.h | 12 ++-- net/mac80211/ieee80211_i.h | 1 + net/mac80211/mlme.c | 61 +++++++++++++++--- net/mac80211/rate.c | 9 ++- net/mac80211/rx.c | 3 + net/mac80211/tkip.c | 4 +- net/mac80211/util.c | 7 ++ net/wireless/core.c | 17 +++-- net/wireless/nl80211.c | 4 ++ net/wireless/sme.c | 3 +- net/wireless/trace.h | 23 ++++--- 35 files changed, 314 insertions(+), 109 deletions(-)
drivers/bcma/scan.c +2 -0
@@ -84,6 +84,8 @@ static const struct bcma_device_id_name bcma_bcm_device_names[] = { { BCMA_CORE_I2S, "I2S" }, { BCMA_CORE_SDR_DDR1_MEM_CTL, "SDR/DDR1 Memory Controller" }, { BCMA_CORE_SHIM, "SHIM" }, + { BCMA_CORE_PCIE2, "PCIe Gen2" }, + { BCMA_CORE_ARM_CR4, "ARM CR4" }, { BCMA_CORE_DEFAULT, "Default" }, };
drivers/net/wireless/ath/ath9k/ar9003_calib.c +1 -1
@@ -965,7 +965,7 @@ static void ar9003_hw_do_manual_peak_cal(struct ath_hw *ah, {int i; -if (!AR_SREV_9462 (ah) && !AR_SREV_9565 (ah)) +if (!AR_SREV_9462 (ah) && !AR_SREV_9565 (ah) && !AR_SREV_9485 (ah))return ;for (i =0 ; i <AR9300_MAX_CHAINS ; i++) {
drivers/net/wireless/ath/ath9k/ar9485_initvals.h +1 -1
@@ -1020,7 +1020,7 @@ static const u32 ar9485_1_1_baseband_postamble[][5] = { {0x0000a284, 0x00000000, 0x00000000, 0x000002a0, 0x000002a0}, {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, - {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18}, + {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00058d18, 0x00058d18}, {0x0000a2d0, 0x00071981, 0x00071981, 0x00071982, 0x00071982}, {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a}, {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
drivers/net/wireless/ath/ath9k/ath9k.h +3 -1
@@ -254,6 +254,7 @@ struct ath_atx_tid {int sched;int paused;u8 state; +bool stop_cb; };struct ath_node {
@@ -351,7 +352,8 @@ void ath_tx_tasklet(struct ath_softc *sc);void ath_tx_edma_tasklet (struct ath_softc *sc);int ath_tx_aggr_start (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid,u16 *ssn); -void ath_tx_aggr_stop (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid); +bool ath_tx_aggr_stop (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid, +bool flush);void ath_tx_aggr_resume (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid);void ath_tx_aggr_wakeup (struct ath_softc *sc,struct ath_node *an);
drivers/net/wireless/ath/ath9k/debug.c +8 -0
@@ -2008,6 +2008,14 @@ void ath9k_get_et_stats(struct ieee80211_hw *hw,WARN_ON (i !=ATH9K_SSTATS_LEN ); } +void ath9k_deinit_debug (struct ath_softc *sc) +{ +if (config_enabled (CONFIG_ATH9K_DEBUGFS ) && sc->rfs_chan_spec_scan) { +relay_close (sc->rfs_chan_spec_scan); + sc->rfs_chan_spec_scan =NULL ; + } +} +int ath9k_init_debug (struct ath_hw *ah) {struct ath_common *common =ath9k_hw_common (ah);
drivers/net/wireless/ath/ath9k/debug.h +5 -0
@@ -304,6 +304,7 @@ struct ath9k_debug { };int ath9k_init_debug (struct ath_hw *ah); +void ath9k_deinit_debug (struct ath_softc *sc);void ath_debug_stat_interrupt (struct ath_softc *sc,enum ath9k_int status); void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
@@ -339,6 +340,10 @@ static inline int ath9k_init_debug(struct ath_hw *ah)return 0 ; } +static inline void ath9k_deinit_debug (struct ath_softc *sc) +{ +} +static inline void ath_debug_stat_interrupt (struct ath_softc *sc,enum ath9k_int status) {
drivers/net/wireless/ath/ath9k/init.c +4 -6
@@ -906,7 +906,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,if (!ath_is_world_regd (reg)) { error =regulatory_hint (hw->wiphy, reg->alpha2);if (error) - goto unregister; + goto debug_cleanup; }ath_init_leds (sc);
@@ -914,6 +914,8 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,return 0 ; +debug_cleanup: +ath9k_deinit_debug (sc); unregister:ieee80211_unregister_hw (hw); rx_cleanup:
@@ -942,11 +944,6 @@ static void ath9k_deinit_softc(struct ath_softc *sc) sc->dfs_detector->exit (sc->dfs_detector);ath9k_eeprom_release (sc); - -if (config_enabled (CONFIG_ATH9K_DEBUGFS ) && sc->rfs_chan_spec_scan) { -relay_close (sc->rfs_chan_spec_scan); - sc->rfs_chan_spec_scan =NULL ; - } }void ath9k_deinit_device (struct ath_softc *sc)
@@ -960,6 +957,7 @@ void ath9k_deinit_device(struct ath_softc *sc)ath9k_ps_restore (sc); +ath9k_deinit_debug (sc);ieee80211_unregister_hw (hw);ath_rx_cleanup (sc);ath9k_deinit_softc (sc);
drivers/net/wireless/ath/ath9k/main.c +5 -3
@@ -1687,6 +1687,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, u16 tid, u16 *ssn, u8 buf_size) { struct ath_softc *sc = hw->priv; +bool flush = false;int ret =0 ;local_bh_disable ();
@@ -1703,12 +1704,13 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,ieee80211_start_tx_ba_cb_irqsafe (vif, sta->addr, tid);ath9k_ps_restore (sc);break ; -case IEEE80211_AMPDU_TX_STOP_CONT :case IEEE80211_AMPDU_TX_STOP_FLUSH :case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT : + flush = true; +case IEEE80211_AMPDU_TX_STOP_CONT :ath9k_ps_wakeup (sc); -ath_tx_aggr_stop (sc, sta, tid); -ieee80211_stop_tx_ba_cb_irqsafe (vif, sta->addr, tid); +if (ath_tx_aggr_stop (sc, sta, tid, flush)) +ieee80211_stop_tx_ba_cb_irqsafe (vif, sta->addr, tid);ath9k_ps_restore (sc);break ;case IEEE80211_AMPDU_TX_OPERATIONAL :
drivers/net/wireless/ath/ath9k/xmit.c +48 -26
165 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +6 -1
@@ -4140,6 +4140,10 @@ static const struct ieee80211_iface_limit brcmf_iface_limits[] = { .types = BIT(NL80211_IFTYPE_P2P_CLIENT) | BIT(NL80211_IFTYPE_P2P_GO) }, + { + .max = 1, + .types = BIT(NL80211_IFTYPE_P2P_DEVICE) + } };static const struct ieee80211_iface_combination brcmf_iface_combos[] = { {
@@ -4197,7 +4201,8 @@ static struct wiphy *brcmf_setup_wiphy(struct device *phydev)BIT (NL80211_IFTYPE_ADHOC ) |BIT (NL80211_IFTYPE_AP ) |BIT (NL80211_IFTYPE_P2P_CLIENT ) | -BIT (NL80211_IFTYPE_P2P_GO ); +BIT (NL80211_IFTYPE_P2P_GO ) | +BIT (NL80211_IFTYPE_P2P_DEVICE ); wiphy->iface_combinations = brcmf_iface_combos; wiphy->n_iface_combinations =ARRAY_SIZE (brcmf_iface_combos); wiphy->bands[IEEE80211_BAND_2GHZ ] = &__wl_band_2ghz;
drivers/net/wireless/iwlegacy/common.c +1 -1
@@ -1423,7 +1423,7 @@ il_setup_rx_scan_handlers(struct il_priv *il) }EXPORT_SYMBOL (il_setup_rx_scan_handlers); -inline u16 +u16 il_get_active_dwell_time (struct il_priv *il,enum ieee80211_band band,u8 n_probes) {
drivers/net/wireless/iwlwifi/mvm/fw-api.h +27 -0
@@ -173,6 +173,8 @@ enum {REPLY_DEBUG_CMD =0xf0 ,DEBUG_LOG_MSG =0xf7 , +MCAST_FILTER_CMD =0xd0 , +/* D3 commands/notifications */ D3_CONFIG_CMD =0xd3 , PROT_OFFLOAD_CONFIG_CMD = 0xd4,
@@ -948,4 +950,29 @@ struct iwl_set_calib_default_cmd { u8 data[0]; } __packed;/* PHY_CALIB_OVERRIDE_VALUES_S */ +#define MAX_PORT_ID_NUM 2 + +/** +* struct iwl_mcast_filter_cmd - configure multicast filter. +* @filter_own: Set 1 to filter out multicast packets sent by station itself +* @port_id: Multicast MAC addresses array specifier. This is a strange way +* to identify network interface adopted in host-device IF. +* It is used by FW as index in array of addresses. This array has +* MAX_PORT_ID_NUM members. +* @count: Number of MAC addresses in the array +* @pass_all: Set 1 to pass all multicast packets. +* @bssid: current association BSSID. +* @addr_list: Place holder for array of MAC addresses. +* IMPORTANT: add padding if necessary to ensure DWORD alignment. +*/ +struct iwl_mcast_filter_cmd { +u8 filter_own; +u8 port_id; +u8 count; +u8 pass_all; +u8 bssid[6 ]; +u8 reserved[2 ]; +u8 addr_list[0 ]; +} __packed;/* MCAST_FILTERING_CMD_API_S_VER_1 */ +#endif /* __fw_api_h__ */
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c +8 -4
@@ -586,10 +586,12 @@ static int iwl_mvm_mac_ctxt_send_cmd(struct iwl_mvm *mvm,*/ static void iwl_mvm_mac_ctxt_cmd_fill_sta (struct iwl_mvm *mvm,struct ieee80211_vif *vif, -struct iwl_mac_data_sta *ctxt_sta) +struct iwl_mac_data_sta *ctxt_sta, +bool force_assoc_off) {/* We need the dtim_period to set the MAC as associated */ -if (vif->bss_conf.assoc && vif->bss_conf.dtim_period) { +if (vif->bss_conf.assoc && vif->bss_conf.dtim_period && + !force_assoc_off) {u32 dtim_offs;/*
@@ -659,7 +661,8 @@ static int iwl_mvm_mac_ctxt_cmd_station(struct iwl_mvm *mvm, cmd.filter_flags &= ~cpu_to_le32 (MAC_FILTER_IN_BEACON );/* Fill the data specific for station mode */ -iwl_mvm_mac_ctxt_cmd_fill_sta (mvm, vif, &cmd.sta); +iwl_mvm_mac_ctxt_cmd_fill_sta (mvm, vif, &cmd.sta, + action ==FW_CTXT_ACTION_ADD );return iwl_mvm_mac_ctxt_send_cmd (mvm, &cmd); }
@@ -677,7 +680,8 @@ static int iwl_mvm_mac_ctxt_cmd_p2p_client(struct iwl_mvm *mvm,iwl_mvm_mac_ctxt_cmd_common (mvm, vif, &cmd, action);/* Fill the data specific for station mode */ -iwl_mvm_mac_ctxt_cmd_fill_sta (mvm, vif, &cmd.p2p_sta.sta); +iwl_mvm_mac_ctxt_cmd_fill_sta (mvm, vif, &cmd.p2p_sta.sta, + action ==FW_CTXT_ACTION_ADD ); cmd.p2p_sta.ctwin =cpu_to_le32 (noa->oppps_ctwindow &IEEE80211_P2P_OPPPS_CTWINDOW_MASK );
drivers/net/wireless/iwlwifi/mvm/mac80211.c +16 -1
@@ -701,6 +701,20 @@ static void iwl_mvm_configure_filter(struct ieee80211_hw *hw, *total_flags =0 ; } +static int iwl_mvm_configure_mcast_filter (struct iwl_mvm *mvm, +struct ieee80211_vif *vif) +{ +struct iwl_mcast_filter_cmd mcast_filter_cmd = { + .pass_all =1 , + }; + +memcpy (mcast_filter_cmd.bssid, vif->bss_conf.bssid,ETH_ALEN ); + +return iwl_mvm_send_cmd_pdu (mvm,MCAST_FILTER_CMD ,CMD_SYNC , +sizeof (mcast_filter_cmd), + &mcast_filter_cmd); +} + static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, struct ieee80211_vif *vif, struct ieee80211_bss_conf *bss_conf,
@@ -722,6 +736,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,return ; }iwl_mvm_bt_coex_vif_assoc (mvm, vif); +iwl_mvm_configure_mcast_filter (mvm, vif); }else if (mvmvif->ap_sta_id !=IWL_MVM_STATION_COUNT ) {/* remove AP station now that the MAC is unassoc */ ret =iwl_mvm_rm_sta_id (mvm, vif, mvmvif->ap_sta_id);
@@ -931,7 +946,7 @@ static void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw,switch (cmd) {case STA_NOTIFY_SLEEP : -if (atomic_read (&mvmsta->pending_frames) >0 ) +if (atomic_read (&mvm->pending_frames[mvmsta->sta_id]) >0 )ieee80211_sta_block_awake (hw, sta, true);/* * The fw updates the STA to be asleep. Tx packets on the Tx
drivers/net/wireless/iwlwifi/mvm/mvm.h +1 -0
@@ -292,6 +292,7 @@ struct iwl_mvm {struct ieee80211_sta __rcu *fw_id_to_mac_id[IWL_MVM_STATION_COUNT ];struct work_struct sta_drained_wk;unsigned long sta_drained[BITS_TO_LONGS (IWL_MVM_STATION_COUNT )]; +atomic_t pending_frames[IWL_MVM_STATION_COUNT ];/* configured by mac80211 */ u32 rts_threshold;
drivers/net/wireless/iwlwifi/mvm/ops.c +1 -0
@@ -292,6 +292,7 @@ static const char *iwl_mvm_cmd_strings[REPLY_MAX] = {CMD (BT_COEX_PROT_ENV ),CMD (BT_PROFILE_NOTIFICATION ),CMD (BT_CONFIG ), + CMD(MCAST_FILTER_CMD), };#undef CMD
drivers/net/wireless/iwlwifi/mvm/scan.c +6 -0
@@ -298,6 +298,12 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm,else cmd->type =cpu_to_le32 (SCAN_TYPE_FORCED ); +/* +* TODO: This is a WA due to a bug in the FW AUX framework that does not +* properly handle time events that fail to be scheduled +*/ + cmd->type =cpu_to_le32 (SCAN_TYPE_FORCED ); + cmd->repeats =cpu_to_le32 (1 );/*
drivers/net/wireless/iwlwifi/mvm/sta.c +10 -3
@@ -219,7 +219,7 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm, mvm_sta->max_agg_bufsize =LINK_QUAL_AGG_FRAME_LIMIT_DEF ;/* HW restart, don't assume the memory has been zeroed */ -atomic_set (&mvm_sta->pending_frames,0 ); +atomic_set (&mvm->pending_frames[sta_id],0 ); mvm_sta->tid_disable_agg =0 ; mvm_sta->tfd_queue_msk =0 ;for (i =0 ; i <IEEE80211_NUM_ACS ; i++)
@@ -407,14 +407,21 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm, }/* +* Make sure that the tx response code sees the station as -EBUSY and +* calls the drain worker. +*/ +spin_lock_bh (&mvm_sta->lock); +/* * There are frames pending on the AC queues for this station. * We need to wait until all the frames are drained... */ -if (atomic_read (&mvm_sta->pending_frames)) { - ret =iwl_mvm_drain_sta (mvm, mvm_sta, true); +if (atomic_read (&mvm->pending_frames[mvm_sta->sta_id])) {rcu_assign_pointer (mvm->fw_id_to_mac_id[mvm_sta->sta_id],ERR_PTR (-EBUSY )); +spin_unlock_bh (&mvm_sta->lock); + ret =iwl_mvm_drain_sta (mvm, mvm_sta, true); }else { +spin_unlock_bh (&mvm_sta->lock); ret =iwl_mvm_rm_sta_common (mvm, mvm_sta->sta_id);rcu_assign_pointer (mvm->fw_id_to_mac_id[mvm_sta->sta_id],NULL ); }
drivers/net/wireless/iwlwifi/mvm/sta.h +0 -2
@@ -274,7 +274,6 @@ struct iwl_mvm_tid_data {* @bt_reduced_txpower: is reduced tx power enabled for this station * @lock: lock to protect the whole struct. Since %tid_data is access from Tx * and from Tx response flow, it needs a spinlock. -* @pending_frames: number of frames for this STA on the shared Tx queues. * @tid_data: per tid data. Look at %iwl_mvm_tid_data. * * When mac80211 creates a station it reserves some space (hw->sta_data_size)
@@ -290,7 +289,6 @@ struct iwl_mvm_sta {u8 max_agg_bufsize;bool bt_reduced_txpower;spinlock_t lock; -atomic_t pending_frames;struct iwl_mvm_tid_data tid_data[IWL_MAX_TID_COUNT ];struct iwl_lq_sta lq_sta;struct ieee80211_vif *vif;
drivers/net/wireless/iwlwifi/mvm/tx.c +36 -12
61 lines not on this page · raw message
drivers/net/wireless/mac80211_hwsim.c +9 -9
@@ -1723,11 +1723,11 @@ static void mac80211_hwsim_free(void)class_destroy (hwsim_class); } - -static struct device_driver mac80211_hwsim_driver = { - .name ="mac80211_hwsim" , - .bus = &platform_bus_type, - .owner =THIS_MODULE , +static struct platform_driver mac80211_hwsim_driver = { + .driver = { + .name ="mac80211_hwsim" , + .owner =THIS_MODULE , + }, };static const struct net_device_ops hwsim_netdev_ops = {
@@ -2219,7 +2219,7 @@ static int __init init_mac80211_hwsim(void)spin_lock_init (&hwsim_radio_lock);INIT_LIST_HEAD (&hwsim_radios); - err =driver_register (&mac80211_hwsim_driver); + err =platform_driver_register (&mac80211_hwsim_driver);if (err)return err;
@@ -2254,7 +2254,7 @@ static int __init init_mac80211_hwsim(void) err = -ENOMEM ; goto failed_drvdata; } - data->dev->driver = &mac80211_hwsim_driver; + data->dev->driver = &mac80211_hwsim_driver.driver; err =device_bind_driver (data->dev);if (err !=0 ) { printk(KERN_DEBUG
@@ -2564,7 +2564,7 @@ failed_drvdata: failed:mac80211_hwsim_free (); failed_unregister_driver: -driver_unregister (&mac80211_hwsim_driver); +platform_driver_unregister (&mac80211_hwsim_driver);return err; }module_init (init_mac80211_hwsim);
@@ -2577,6 +2577,6 @@ static void __exit exit_mac80211_hwsim(void)mac80211_hwsim_free ();unregister_netdev (hwsim_mon); -driver_unregister (&mac80211_hwsim_driver); +platform_driver_unregister (&mac80211_hwsim_driver); }module_exit (exit_mac80211_hwsim);
drivers/net/wireless/rtlwifi/rtl8188ee/trx.h +2 -2
@@ -550,7 +550,7 @@ do { \ rxmcs == DESC92C_RATE11M)struct phy_rx_agc_info_t { -#if __LITTLE_ENDIAN +#ifdef __LITTLE_ENDIANu8 gain:7 , trsw:1 ;#else u8 trsw:1 , gain:7 ;
@@ -574,7 +574,7 @@ struct phy_status_rpt {u8 stream_target_csi[2 ];u8 sig_evm;u8 rsvd_3; -#if __LITTLE_ENDIAN +#ifdef __LITTLE_ENDIAN u8 antsel_rx_keep_2:1; /*ex_intf_flg:1;*/ u8 sgi_en:1; u8 rxsc:2;
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 -0
@@ -349,6 +349,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = { {RTL_USB_DEVICE(0x07aa, 0x0056, rtl92cu_hal_cfg)}, /*ATKK-Gemtek*/ {RTL_USB_DEVICE(0x07b8, 0x8178, rtl92cu_hal_cfg)}, /*Funai -Abocom*/ {RTL_USB_DEVICE(0x0846, 0x9021, rtl92cu_hal_cfg)}, /*Netgear-Sercomm*/ + {RTL_USB_DEVICE(0x0846, 0xf001, rtl92cu_hal_cfg)}, /*On Netwrks N300MA*/ {RTL_USB_DEVICE(0x0b05, 0x17ab, rtl92cu_hal_cfg)}, /*ASUS-Edimax*/ {RTL_USB_DEVICE(0x0bda, 0x8186, rtl92cu_hal_cfg)}, /*Realtek 92CE-VAU*/ {RTL_USB_DEVICE(0x0df6, 0x0061, rtl92cu_hal_cfg)}, /*Sitecom-Edimax*/
include/linux/bcma/bcma.h +4 -1
@@ -134,7 +134,10 @@ struct bcma_host_ops {#define BCMA_CORE_I2S 0x834#define BCMA_CORE_SDR_DDR1_MEM_CTL 0x835/* SDR/DDR1 memory controller core */ #define BCMA_CORE_SHIM 0x837/* SHIM component in ubus/6362 */ -#define BCMA_CORE_ARM_CR4 0x83e +#define BCMA_CORE_PHY_AC 0x83B +#define BCMA_CORE_PCIE2 0x83C/* PCI Express Gen2 */ +#define BCMA_CORE_USB30_DEV 0x83D +#define BCMA_CORE_ARM_CR4 0x83E#define BCMA_CORE_DEFAULT 0xFFF#define BCMA_MAX_NR_CORES 16
include/net/mac80211.h +8 -4
@@ -3043,7 +3043,8 @@ void ieee80211_napi_complete(struct ieee80211_hw *hw);* This function may not be called in IRQ context. Calls to this function * for a single hardware must be synchronized against each other. Calls to * this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be -* mixed for a single hardware. +* mixed for a single hardware. Must not run concurrently with +* ieee80211_tx_status() or ieee80211_tx_status_ni(). * * In process context use instead ieee80211_rx_ni(). *
@@ -3059,7 +3060,8 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);* (internally defers to a tasklet.) * * Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not -* be mixed for a single hardware. +* be mixed for a single hardware.Must not run concurrently with +* ieee80211_tx_status() or ieee80211_tx_status_ni(). * * @hw: the hardware this frame came in on * @skb: the buffer to receive, owned by mac80211 after this call
@@ -3073,7 +3075,8 @@ void ieee80211_rx_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb);* (internally disables bottom halves). * * Calls to this function, ieee80211_rx() and ieee80211_rx_irqsafe() may -* not be mixed for a single hardware. +* not be mixed for a single hardware. Must not run concurrently with +* ieee80211_tx_status() or ieee80211_tx_status_ni(). * * @hw: the hardware this frame came in on * @skb: the buffer to receive, owned by mac80211 after this call
@@ -3196,7 +3199,8 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif,* This function may not be called in IRQ context. Calls to this function * for a single hardware must be synchronized against each other. Calls * to this function, ieee80211_tx_status_ni() and ieee80211_tx_status_irqsafe() -* may not be mixed for a single hardware. +* may not be mixed for a single hardware. Must not run concurrently with +* ieee80211_rx() or ieee80211_rx_ni(). * * @hw: the hardware the frame was transmitted by * @skb: the frame that was transmitted, owned by mac80211 after this call
net/mac80211/ieee80211_i.h +1 -0
@@ -1267,6 +1267,7 @@ void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata);void ieee80211_mgd_stop (struct ieee80211_sub_if_data *sdata);void ieee80211_mgd_conn_tx_status (struct ieee80211_sub_if_data *sdata,__le16 fc,bool acked); +void ieee80211_sta_restart (struct ieee80211_sub_if_data *sdata);/* IBSS code */ void ieee80211_ibss_notify_scan_completed (struct ieee80211_local *local);
net/mac80211/mlme.c +51 -10
138 lines not on this page · raw message
net/mac80211/rate.c +8 -1
@@ -688,8 +688,15 @@ int rate_control_set_rates(struct ieee80211_hw *hw,struct ieee80211_sta *pubsta, struct ieee80211_sta_rates *rates) { - struct ieee80211_sta_rates *old = rcu_dereference(pubsta->rates); + struct ieee80211_sta_rates *old; +/* +* mac80211 guarantees that this function will not be called +* concurrently, so the following RCU access is safe, even without +* extra locking. This can not be checked easily, so we just set +* the condition to true. +*/ + old =rcu_dereference_protected (pubsta->rates, true);rcu_assign_pointer (pubsta->rates, rates);if (old)kfree_rcu (old, rcu_head);
net/mac80211/rx.c +3 -0
@@ -3036,6 +3036,9 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx,* and location updates. Note that mac80211 * itself never looks at these frames. */ +if (!multicast && + !ether_addr_equal (sdata->vif.addr, hdr->addr1)) +return 0 ;if (ieee80211_is_public_action (hdr, skb->len))return 1 ;if (!ieee80211_is_beacon (hdr->frame_control))
net/mac80211/tkip.c +2 -2
@@ -208,10 +208,10 @@ void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf,u32 iv32 =get_unaligned_le32 (&data[4 ]);u16 iv16 = data[2 ] | (data[0 ] <<8 ); -spin_lock_bh (&key->u.tkip.txlock); +spin_lock (&key->u.tkip.txlock);ieee80211_compute_tkip_p1k (key, iv32);tkip_mixing_phase2 (tk, ctx, iv16, p2k); -spin_unlock_bh (&key->u.tkip.txlock); +spin_unlock (&key->u.tkip.txlock); }EXPORT_SYMBOL (ieee80211_get_tkip_p2k);
net/mac80211/util.c +7 -0
@@ -1740,6 +1740,13 @@ int ieee80211_reconfig(struct ieee80211_local *local)mb (); local->resuming = false; +list_for_each_entry (sdata, &local->interfaces, list) { +if (!ieee80211_sdata_running (sdata)) +continue ; +if (sdata->vif.type ==NL80211_IFTYPE_STATION ) +ieee80211_sta_restart (sdata); + } +mod_timer (&local->sta_cleanup, jiffies +1 );#else WARN_ON (1 );
net/wireless/core.c +10 -7
@@ -638,17 +638,21 @@ int wiphy_register(struct wiphy *wiphy)* cfg80211_mutex lock */ res =rfkill_register (rdev->rfkill); -if (res) - goto out_rm_dev; +if (res) { +device_del (&rdev->wiphy.dev); + +mutex_lock (&cfg80211_mutex); +debugfs_remove_recursive (rdev->wiphy.debugfsdir); +list_del_rcu (&rdev->list); +wiphy_regulatory_deregister (wiphy); +mutex_unlock (&cfg80211_mutex); +return res; + }rtnl_lock (); rdev->wiphy.registered = true;rtnl_unlock ();return 0 ; - -out_rm_dev: -device_del (&rdev->wiphy.dev); -return res; }EXPORT_SYMBOL (wiphy_register);
@@ -866,7 +870,6 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev,#endif __cfg80211_disconnect (rdev, dev,WLAN_REASON_DEAUTH_LEAVING , true); -cfg80211_mlme_down (rdev, dev);wdev_unlock (wdev);break ;case NL80211_IFTYPE_MESH_POINT :
net/wireless/nl80211.c +4 -0
@@ -7577,6 +7577,8 @@ static int nl80211_send_wowlan_tcp(struct sk_buff *msg, &tcp->payload_tok))return -ENOBUFS ; +nla_nest_end (msg, nl_tcp); +return 0 ; }
@@ -9970,6 +9972,7 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev, if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) || (netdev && nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex)) || + nla_put_u64(msg, NL80211_ATTR_WDEV, wdev_id(wdev)) || nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq) || (sig_dbm && nla_put_u32(msg, NL80211_ATTR_RX_SIGNAL_DBM, sig_dbm)) ||
@@ -10010,6 +10013,7 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,if (nla_put_u32 (msg,NL80211_ATTR_WIPHY , rdev->wiphy_idx) || (netdev &&nla_put_u32 (msg,NL80211_ATTR_IFINDEX , netdev->ifindex)) || +nla_put_u64 (msg,NL80211_ATTR_WDEV ,wdev_id (wdev)) ||nla_put (msg,NL80211_ATTR_FRAME , len, buf) ||nla_put_u64 (msg,NL80211_ATTR_COOKIE , cookie) || (ack &&nla_put_flag (msg,NL80211_ATTR_ACK )))
net/wireless/sme.c +2 -1
@@ -961,7 +961,7 @@ int __cfg80211_disconnect(struct cfg80211_registered_device *rdev,/* was it connected by userspace SME? */ if (!wdev->conn) {cfg80211_mlme_down (rdev, dev); -return 0 ; + goto disconnect; } if (wdev->sme_state == CFG80211_SME_CONNECTING &&
@@ -987,6 +987,7 @@ int __cfg80211_disconnect(struct cfg80211_registered_device *rdev,return err; } + disconnect:if (wdev->sme_state ==CFG80211_SME_CONNECTED )__cfg80211_disconnected (dev,NULL ,0 ,0 , false);else if (wdev->sme_state ==CFG80211_SME_CONNECTING )
net/wireless/trace.h +13 -10
@@ -2441,6 +2441,7 @@ TRACE_EVENT(cfg80211_report_wowlan_wakeup,TP_STRUCT__entry ( WIPHY_ENTRY WDEV_ENTRY + __field(bool, non_wireless) __field(bool, disconnect) __field(bool, magic_pkt) __field(bool, gtk_rekey_failure)
@@ -2449,20 +2450,22 @@ TRACE_EVENT(cfg80211_report_wowlan_wakeup, __field(bool, rfkill_release) __field(s32, pattern_idx) __field(u32, packet_len) -__dynamic_array (u8, packet, wakeup->packet_present_len) +__dynamic_array (u8, packet, + wakeup ? wakeup->packet_present_len :0 ) ),TP_fast_assign ( WIPHY_ASSIGN;WDEV_ASSIGN ; - __entry->disconnect = wakeup->disconnect; - __entry->magic_pkt = wakeup->magic_pkt; - __entry->gtk_rekey_failure = wakeup->gtk_rekey_failure; - __entry->eap_identity_req = wakeup->eap_identity_req; - __entry->four_way_handshake = wakeup->four_way_handshake; - __entry->rfkill_release = wakeup->rfkill_release; - __entry->pattern_idx = wakeup->pattern_idx; - __entry->packet_len = wakeup->packet_len; -if (wakeup->packet && wakeup->packet_present_len) + __entry->non_wireless = !wakeup; + __entry->disconnect = wakeup ? wakeup->disconnect : false; + __entry->magic_pkt = wakeup ? wakeup->magic_pkt : false; + __entry->gtk_rekey_failure = wakeup ? wakeup->gtk_rekey_failure : false; + __entry->eap_identity_req = wakeup ? wakeup->eap_identity_req : false; + __entry->four_way_handshake = wakeup ? wakeup->four_way_handshake : false; + __entry->rfkill_release = wakeup ? wakeup->rfkill_release : false; + __entry->pattern_idx = wakeup ? wakeup->pattern_idx : false; + __entry->packet_len = wakeup ? wakeup->packet_len : false; +if (wakeup && wakeup->packet && wakeup->packet_present_len)memcpy (__get_dynamic_array (packet), wakeup->packet, wakeup->packet_present_len); ),
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: Mon, 20 May 2013 15:36:44 -0400
Quoted 3 lines
This pull request is intended for the 3.10 series. It contains a variety of fixes for problems discovered during the merge window and after 3.10-rc1.
Pulled, thanks John.