---

yaml --- r: 368475 b: refs/heads/master c: 6bfcb7e h: refs/heads/master i: 368473: 13732d7 368471: 46ef87c v: v3
git-mirror · Mar 6, 2013 · 746e1ec · 746e1ec
1 parent ff76a63
commit 746e1ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;