From 746e1ec542be91e3b2578d8bad7ecc10f720f3db Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Sun, 3 Mar 2013 10:19:45 +0200 Subject: [PATCH] --- yaml --- r: 368475 b: refs/heads/master c: 6bfcb7e88cbb45782664caeb9bfe1a1c1b83a10e h: refs/heads/master i: 368473: 13732d7eab92aaceaebc45c6d9525eaf9c0ce905 368471: 46ef87cc5a326986382e29618dad3963cd22bcdd v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/mvm/fw-api.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index de62bdbe1a96..55462757b2f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1094234284a2afe46202773ebd9ae55416092d9c +refs/heads/master: 6bfcb7e88cbb45782664caeb9bfe1a1c1b83a10e diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/trunk/drivers/net/wireless/iwlwifi/mvm/fw-api.h index da9ee3fe3379..f8d7e88234e4 100644 --- a/trunk/drivers/net/wireless/iwlwifi/mvm/fw-api.h +++ b/trunk/drivers/net/wireless/iwlwifi/mvm/fw-api.h @@ -801,6 +801,7 @@ struct iwl_phy_context_cmd { * @byte_count: frame's byte-count * @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 * * Before each Rx, the device sends this data. It contains PHY information * about the reception of the packet. @@ -818,7 +819,7 @@ struct iwl_rx_phy_info { __le32 non_cfg_phy[IWL_RX_INFO_PHY_CNT]; __le32 rate_n_flags; __le32 byte_count; - __le16 reserved2; + __le16 mac_active_msk; __le16 frame_time; } __packed;