Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rt2x00 / rt2800.h

diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 25c94b596e93ac8bcc00cf30be1923c10ccb878a..a7630d5ec8921cb9c3024e9fcf07e0bbf1a5071c 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -1939,6 +1939,9 @@ struct mac_iveiv_entry {
 #define BBP4_BANDWIDTH                 FIELD8(0x18)
 #define BBP4_MAC_IF_CTRL               FIELD8(0x40)
 
+/* BBP27 */
+#define BBP27_RX_CHAIN_SEL             FIELD8(0x60)
+
 /*
  * BBP 47: Bandwidth
  */
@@ -2625,6 +2628,8 @@ struct mac_iveiv_entry {
 #define TXWI_DESC_SIZE                 (4 * sizeof(__le32))
 #define RXWI_DESC_SIZE                 (4 * sizeof(__le32))
 
+#define TXWI_DESC_SIZE_5592            (5 * sizeof(__le32))
+#define RXWI_DESC_SIZE_5592            (6 * sizeof(__le32))
 /*
  * TX WI structure
  */