iwlwifi: mvm: Add support for RRM by scan

[cascardo/linux.git] / drivers / net / wireless / intel / iwlwifi / mvm / mvm.h

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 1806495..e68a2bd 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -467,6 +467,8 @@ struct iwl_mvm_vif {
 static inline struct iwl_mvm_vif *
 iwl_mvm_vif_from_mac80211(struct ieee80211_vif *vif)
 {
+       if (!vif)
+               return NULL;
        return (void *)vif->drv_priv;
 }
 
@@ -602,16 +604,9 @@ enum iwl_mvm_tdls_cs_state {
 };
 
 struct iwl_mvm_shared_mem_cfg {
-       u32 shared_mem_addr;
-       u32 shared_mem_size;
-       u32 sample_buff_addr;
-       u32 sample_buff_size;
-       u32 txfifo_addr;
+       int num_txfifo_entries;
        u32 txfifo_size[TX_FIFO_MAX_NUM];
        u32 rxfifo_size[RX_FIFO_MAX_NUM];
-       u32 page_buff_addr;
-       u32 page_buff_size;
-       u32 rxfifo_addr;
        u32 internal_txfifo_addr;
        u32 internal_txfifo_size[TX_FIFO_INTERNAL_MAX_NUM];
 };
@@ -826,6 +821,12 @@ struct iwl_mvm {
        /* UMAC scan tracking */
        u32 scan_uid_status[IWL_MVM_MAX_UMAC_SCANS];
 
+       /* start time of last scan in TSF of the mac that requested the scan */
+       u64 scan_start;
+
+       /* the vif that requested the current scan */
+       struct iwl_mvm_vif *scan_vif;
+
        /* rx chain antennas set through debugfs for the scan command */
        u8 scan_rx_ant;