From: Reinette Chatre <reinette.chatre@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Wey-Yi Guy <wey-yi.w.guy@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>
Subject: [PATCH 05/14] iwlwifi: change IWL6000_UCODE_API_MAX to v4
Date: Fri, 21 Aug 2009 13:34:18 -0700 [thread overview]
Message-ID: <1250886867-4112-6-git-send-email-reinette.chatre@intel.com> (raw)
In-Reply-To: <1250886867-4112-1-git-send-email-reinette.chatre@intel.com>
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
uCode version changed to v4 for 6000 series
The additional parameter added to v4 is providing current tx power for
each chain in tx statistics portion of "statistics notification"
command.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-6000.c | 4 ++--
drivers/net/wireless/iwlwifi/iwl-commands.h | 18 ++++++++++++++++--
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 383177d..33ef736 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -46,8 +46,8 @@
#include "iwl-5000-hw.h"
/* Highest firmware API version supported */
-#define IWL6000_UCODE_API_MAX 3
-#define IWL6050_UCODE_API_MAX 3
+#define IWL6000_UCODE_API_MAX 4
+#define IWL6050_UCODE_API_MAX 4
/* Lowest firmware API version supported */
#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 f430384..6b82d4e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -2930,6 +2930,20 @@ struct statistics_rx {
struct statistics_rx_ht_phy ofdm_ht;
} __attribute__ ((packed));
+/**
+ * struct statistics_tx_power - current tx power
+ *
+ * @ant_a: current tx power on chain a in 1/2 dB step
+ * @ant_b: current tx power on chain b in 1/2 dB step
+ * @ant_c: current tx power on chain c in 1/2 dB step
+ */
+struct statistics_tx_power {
+ u8 ant_a;
+ u8 ant_b;
+ u8 ant_c;
+ u8 reserved;
+} __attribute__ ((packed));
+
struct statistics_tx_non_phy_agg {
__le32 ba_timeout;
__le32 ba_reschedule_frames;
@@ -2941,8 +2955,6 @@ struct statistics_tx_non_phy_agg {
__le32 underrun;
__le32 bt_prio_kill;
__le32 rx_ba_rsp_cnt;
- __le32 reserved2;
- __le32 reserved3;
} __attribute__ ((packed));
struct statistics_tx {
@@ -2961,6 +2973,8 @@ struct statistics_tx {
__le32 cts_timeout_collision;
__le32 ack_or_ba_timeout_collision;
struct statistics_tx_non_phy_agg agg;
+ struct statistics_tx_power tx_power;
+ __le32 reserved1;
} __attribute__ ((packed));
--
1.5.6.3
next prev parent reply other threads:[~2009-08-21 20:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-21 20:34 [PATCH 0/14] iwlwifi and ipw2x00 driver updates Reinette Chatre
2009-08-21 20:34 ` [PATCH 01/14] iwlwifi: set default tx power user limit to minimal Reinette Chatre
2009-08-21 20:34 ` [PATCH 02/14] iwlwifi: do not allow set tx power over channel power limit Reinette Chatre
2009-08-21 20:34 ` [PATCH 03/14] iwlwifi: name changes from "tx_power_channel_lmt" to "tx_power_device_lmt" Reinette Chatre
2009-08-21 20:34 ` [PATCH 04/14] iwlwifi: error checking for setting tx_power in sysfs Reinette Chatre
2009-08-21 20:34 ` Reinette Chatre [this message]
2009-08-21 20:34 ` [PATCH 06/14] iwlwifi: show current tx power Reinette Chatre
2009-08-21 20:34 ` [PATCH 07/14] iwlwifi: clear rate control flags on non-HT packet Reinette Chatre
2009-08-21 20:34 ` [PATCH 08/14] iwlwifi: set HT flags in ieee80211_rx_status for received packets Reinette Chatre
2009-08-21 20:34 ` [PATCH 09/14] iwlwifi: remove duplicated define Reinette Chatre
2009-08-21 20:34 ` [PATCH 10/14] iwlwifi: read enhanced tx power info from EEPROM image Reinette Chatre
2009-08-21 20:34 ` [PATCH 11/14] iwlwifi: fix remove key error Reinette Chatre
2009-08-21 20:34 ` [PATCH 12/14] iwlwifi: fix unloading driver while scanning Reinette Chatre
2009-08-21 20:34 ` [PATCH 13/14] ipw2x00: update contact information Reinette Chatre
2009-08-21 20:34 ` [PATCH 14/14] MAINTAINERS: Update ipw2x00 and iwlwifi entries Reinette Chatre
2009-08-21 20:56 ` Joe Perches
2009-08-21 21:00 ` reinette chatre
2009-08-21 21:03 ` [PATCH 14/14 v2] " reinette chatre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1250886867-4112-6-git-send-email-reinette.chatre@intel.com \
--to=reinette.chatre@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=wey-yi.w.guy@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox