summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h
diff options
context:
space:
mode:
authorEmmanuel Grumbach2015-12-16 10:26:09 +0100
committerEmmanuel Grumbach2015-12-20 22:27:39 +0100
commitc81240707c71f343d96dae3537997682a9eb436d (patch)
tree4d899628aad0081334908a221c25948e6ad03e54 /drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h
parentiwlwifi: mvm: support description for user triggered fw dbg collection (diff)
downloadkernel-qcow2-linux-c81240707c71f343d96dae3537997682a9eb436d.tar.gz
kernel-qcow2-linux-c81240707c71f343d96dae3537997682a9eb436d.tar.xz
kernel-qcow2-linux-c81240707c71f343d96dae3537997682a9eb436d.zip
iwlwifi: mvm: small update in the firmware API
Small change in firmware API, no functional change. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h
index af7f9dd7954c..75c79e13269e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h
@@ -79,6 +79,11 @@
#define IWL_RX_INFO_ENERGY_ANT_B_POS 8
#define IWL_RX_INFO_ENERGY_ANT_C_POS 16
+enum iwl_mac_context_info {
+ MAC_CONTEXT_INFO_NONE,
+ MAC_CONTEXT_INFO_GSCAN,
+};
+
/**
* struct iwl_rx_phy_info - phy info
* (REPLY_RX_PHY_CMD = 0xc0)
@@ -97,6 +102,8 @@
* @frame_time: frame's time on the air, based on byte count and frame rate
* calculation
* @mac_active_msk: what MACs were active when the frame was received
+ * @mac_context_info: additional info on the context in which the frame was
+ * received as defined in &enum iwl_mac_context_info
*
* Before each Rx, the device sends this data. It contains PHY information
* about the reception of the packet.
@@ -114,7 +121,8 @@ struct iwl_rx_phy_info {
__le32 non_cfg_phy[IWL_RX_INFO_PHY_CNT];
__le32 rate_n_flags;
__le32 byte_count;
- __le16 mac_active_msk;
+ u8 mac_active_msk;
+ u8 mac_context_info;
__le16 frame_time;
} __packed;