diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-27 13:30:49 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-27 13:30:49 +0200 |
| commit | 09e1a79ac03d643960c96314d20a904b39b89a80 (patch) | |
| tree | 8fe7d740f4e8d08a4159a710dd5c6cdc15a85c16 /drivers/net/wireless/iwlwifi/mvm/mvm.h | |
| parent | 071d4990fd9fe6fe27b47f1587ba11db3111c3fd (diff) | |
| parent | a87783699b23395c46bbeeb5d28f6db24897bf26 (diff) | |
| download | linux-09e1a79ac03d643960c96314d20a904b39b89a80.tar.gz linux-09e1a79ac03d643960c96314d20a904b39b89a80.tar.bz2 linux-09e1a79ac03d643960c96314d20a904b39b89a80.zip | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
Conflicts:
drivers/net/wireless/iwlwifi/mvm/ops.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index 02ba8303a09f..4e87a321e107 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h @@ -301,6 +301,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; |