diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-18 17:58:13 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-18 17:58:13 (GMT) |
| commit | 444474dd5b33332100311af8ff31a587f6105011 (patch) | |
| tree | 5d5817ab3198661ab8dcb5348b7139ac6e51b794 /drivers/net/wireless/iwlwifi/mvm/sta.h | |
| parent | a72e25f78134cc0c1ef2adc99d6c3680ebd80e35 (diff) | |
| parent | 246dd9922e859768aa522daa6c1c601785e57e0c (diff) | |
| download | linux-fsl-qoriq-444474dd5b33332100311af8ff31a587f6105011.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/sta.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.h b/drivers/net/wireless/iwlwifi/mvm/sta.h index 94b265e..4dfc359 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.h +++ b/drivers/net/wireless/iwlwifi/mvm/sta.h @@ -293,10 +293,6 @@ struct iwl_mvm_sta { struct iwl_lq_sta lq_sta; struct ieee80211_vif *vif; -#ifdef CONFIG_PM_SLEEP - u16 last_seq_ctl; -#endif - /* Temporary, until the new TLC will control the Tx protection */ s8 tx_protection; bool tt_tx_protection; |