aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-6000.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-commands.h18
2 files changed, 18 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 383177db7de7..33ef736a4857 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -46,8 +46,8 @@
46#include "iwl-5000-hw.h" 46#include "iwl-5000-hw.h"
47 47
48/* Highest firmware API version supported */ 48/* Highest firmware API version supported */
49#define IWL6000_UCODE_API_MAX 3 49#define IWL6000_UCODE_API_MAX 4
50#define IWL6050_UCODE_API_MAX 3 50#define IWL6050_UCODE_API_MAX 4
51 51
52/* Lowest firmware API version supported */ 52/* Lowest firmware API version supported */
53#define IWL6000_UCODE_API_MIN 1 53#define IWL6000_UCODE_API_MIN 1
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index f4303843ff9b..6b82d4ecd3ef 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -2930,6 +2930,20 @@ struct statistics_rx {
2930 struct statistics_rx_ht_phy ofdm_ht; 2930 struct statistics_rx_ht_phy ofdm_ht;
2931} __attribute__ ((packed)); 2931} __attribute__ ((packed));
2932 2932
2933/**
2934 * struct statistics_tx_power - current tx power
2935 *
2936 * @ant_a: current tx power on chain a in 1/2 dB step
2937 * @ant_b: current tx power on chain b in 1/2 dB step
2938 * @ant_c: current tx power on chain c in 1/2 dB step
2939 */
2940struct statistics_tx_power {
2941 u8 ant_a;
2942 u8 ant_b;
2943 u8 ant_c;
2944 u8 reserved;
2945} __attribute__ ((packed));
2946
2933struct statistics_tx_non_phy_agg { 2947struct statistics_tx_non_phy_agg {
2934 __le32 ba_timeout; 2948 __le32 ba_timeout;
2935 __le32 ba_reschedule_frames; 2949 __le32 ba_reschedule_frames;
@@ -2941,8 +2955,6 @@ struct statistics_tx_non_phy_agg {
2941 __le32 underrun; 2955 __le32 underrun;
2942 __le32 bt_prio_kill; 2956 __le32 bt_prio_kill;
2943 __le32 rx_ba_rsp_cnt; 2957 __le32 rx_ba_rsp_cnt;
2944 __le32 reserved2;
2945 __le32 reserved3;
2946} __attribute__ ((packed)); 2958} __attribute__ ((packed));
2947 2959
2948struct statistics_tx { 2960struct statistics_tx {
@@ -2961,6 +2973,8 @@ struct statistics_tx {
2961 __le32 cts_timeout_collision; 2973 __le32 cts_timeout_collision;
2962 __le32 ack_or_ba_timeout_collision; 2974 __le32 ack_or_ba_timeout_collision;
2963 struct statistics_tx_non_phy_agg agg; 2975 struct statistics_tx_non_phy_agg agg;
2976 struct statistics_tx_power tx_power;
2977 __le32 reserved1;
2964} __attribute__ ((packed)); 2978} __attribute__ ((packed));
2965 2979
2966 2980