diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-commands.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index 3e4ba31b5d59..27e250c8d4b5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
@@ -1820,13 +1820,8 @@ enum { | |||
1820 | TX_STATUS_FAIL_TID_DISABLE = 0x8d, | 1820 | TX_STATUS_FAIL_TID_DISABLE = 0x8d, |
1821 | TX_STATUS_FAIL_FIFO_FLUSHED = 0x8e, | 1821 | TX_STATUS_FAIL_FIFO_FLUSHED = 0x8e, |
1822 | TX_STATUS_FAIL_INSUFFICIENT_CF_POLL = 0x8f, | 1822 | TX_STATUS_FAIL_INSUFFICIENT_CF_POLL = 0x8f, |
1823 | /* uCode drop due to FW drop request */ | 1823 | TX_STATUS_FAIL_PASSIVE_NO_RX = 0x90, |
1824 | TX_STATUS_FAIL_FW_DROP = 0x90, | 1824 | TX_STATUS_FAIL_NO_BEACON_ON_RADAR = 0x91, |
1825 | /* | ||
1826 | * uCode drop due to station color mismatch | ||
1827 | * between tx command and station table | ||
1828 | */ | ||
1829 | TX_STATUS_FAIL_STA_COLOR_MISMATCH_DROP = 0x91, | ||
1830 | }; | 1825 | }; |
1831 | 1826 | ||
1832 | #define TX_PACKET_MODE_REGULAR 0x0000 | 1827 | #define TX_PACKET_MODE_REGULAR 0x0000 |
@@ -1868,6 +1863,9 @@ enum { | |||
1868 | AGG_TX_STATE_DELAY_TX_MSK = 0x400 | 1863 | AGG_TX_STATE_DELAY_TX_MSK = 0x400 |
1869 | }; | 1864 | }; |
1870 | 1865 | ||
1866 | #define AGG_TX_STATUS_MSK 0x00000fff /* bits 0:11 */ | ||
1867 | #define AGG_TX_TRY_MSK 0x0000f000 /* bits 12:15 */ | ||
1868 | |||
1871 | #define AGG_TX_STATE_LAST_SENT_MSK (AGG_TX_STATE_LAST_SENT_TTL_MSK | \ | 1869 | #define AGG_TX_STATE_LAST_SENT_MSK (AGG_TX_STATE_LAST_SENT_TTL_MSK | \ |
1872 | AGG_TX_STATE_LAST_SENT_TRY_CNT_MSK | \ | 1870 | AGG_TX_STATE_LAST_SENT_TRY_CNT_MSK | \ |
1873 | AGG_TX_STATE_LAST_SENT_BT_KILL_MSK) | 1871 | AGG_TX_STATE_LAST_SENT_BT_KILL_MSK) |
@@ -2488,7 +2486,12 @@ struct iwlagn_bt_cmd { | |||
2488 | __le16 bt4_decision_time; /* unused */ | 2486 | __le16 bt4_decision_time; /* unused */ |
2489 | __le16 valid; | 2487 | __le16 valid; |
2490 | u8 prio_boost; | 2488 | u8 prio_boost; |
2491 | u8 reserved[3]; | 2489 | /* |
2490 | * set IWLAGN_BT_VALID_BOOST to "1" in "valid" bitmask | ||
2491 | * if configure the following patterns | ||
2492 | */ | ||
2493 | u8 tx_prio_boost; /* SW boost of WiFi tx priority */ | ||
2494 | __le16 rx_prio_boost; /* SW boost of WiFi rx priority */ | ||
2492 | }; | 2495 | }; |
2493 | 2496 | ||
2494 | #define IWLAGN_BT_SCO_ACTIVE cpu_to_le32(BIT(0)) | 2497 | #define IWLAGN_BT_SCO_ACTIVE cpu_to_le32(BIT(0)) |