From: Reinette Chatre <reinette.chatre@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
ipw3945-devel@lists.sourceforge.net,
Wey-Yi Guy <wey-yi.w.guy@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>
Subject: [PATCH 08/18] iwlwifi: increase max tfd payload size
Date: Fri, 23 Oct 2009 13:42:26 -0700 [thread overview]
Message-ID: <1256330556-20997-9-git-send-email-reinette.chatre@intel.com> (raw)
In-Reply-To: <1256330556-20997-1-git-send-email-reinette.chatre@intel.com>
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Increase the size of TFD_MAX_PAYLOAD_SIZE (the size of iwl_device_cmd)
to accommodate iwl6000_channel_switch_cmd data structure.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Acked-by: Ben Cahill <ben.m.cahill@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-dev.h | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 1378654..b520e55 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -364,7 +364,7 @@ enum {
CMD_WANT_SKB = (1 << 2),
};
-#define IWL_CMD_MAX_PAYLOAD 320
+#define DEF_CMD_PAYLOAD_SIZE 320
/*
* IWL_LINK_HDR_MAX should include ieee80211_hdr, radiotap header,
@@ -388,7 +388,8 @@ struct iwl_device_cmd {
u16 val16;
u32 val32;
struct iwl_tx_cmd tx;
- u8 payload[IWL_CMD_MAX_PAYLOAD];
+ struct iwl6000_channel_switch_cmd chswitch;
+ u8 payload[DEF_CMD_PAYLOAD_SIZE];
} __attribute__ ((packed)) cmd;
} __attribute__ ((packed));
@@ -741,7 +742,11 @@ static inline int iwl_queue_used(const struct iwl_queue *q, int i)
static inline u8 get_cmd_index(struct iwl_queue *q, u32 index, int is_huge)
{
- /* This is for scan command, the big buffer at end of command array */
+ /*
+ * This is for init calibration result and scan command which
+ * required buffer > TFD_MAX_PAYLOAD_SIZE,
+ * the big buffer at end of command array
+ */
if (is_huge)
return q->n_window; /* must be power of 2 */
--
1.5.6.3
next prev parent reply other threads:[~2009-10-23 20:42 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-23 20:42 [PATCH 00/18] iwlwifi updates 10/23/2009 Reinette Chatre
2009-10-23 20:42 ` [PATCH 01/18] iwlwifi: add missing commands to syslog messages Reinette Chatre
2009-10-23 20:42 ` [PATCH 02/18] iwlwifi: fix gain computation for 5000 series and up Reinette Chatre
2009-10-23 20:42 ` [PATCH 03/18] iwlwifi: consolidate apm_init() functions Reinette Chatre
2009-10-23 20:42 ` [PATCH 04/18] iwlwifi: separate led function from statistic notification Reinette Chatre
2009-10-23 20:42 ` [PATCH 05/18] iwlwifi: update bt co-exit configuration parameter Reinette Chatre
2009-10-23 20:42 ` [PATCH 06/18] iwlwifi: specify the valid tx/rx chain in device config structure Reinette Chatre
2009-10-23 20:42 ` [PATCH 07/18] iwlwifi: fix use after free bug for paged rx Reinette Chatre
2009-10-23 20:42 ` Reinette Chatre [this message]
2009-10-23 20:42 ` [PATCH 09/18] iwlwifi: choose thermal throttle method based on device config Reinette Chatre
2009-10-23 20:42 ` [PATCH 10/18] iwlwifi: issue ct_kill host command " Reinette Chatre
2009-10-23 20:42 ` [PATCH 11/18] iwlwifi: add channel switch support to 5000 series and up Reinette Chatre
2009-10-23 20:42 ` [PATCH 12/18] iwlwifi: remove duplicate defines Reinette Chatre
2009-10-23 20:42 ` [PATCH 13/18] iwlwifi: remove unused parameters Reinette Chatre
2009-10-23 20:42 ` [PATCH 14/18] iwlwifi: reuse page for notification packets Reinette Chatre
2009-10-23 20:42 ` [PATCH 15/18] iwlwifi: remove duplicated define Reinette Chatre
2009-10-23 20:42 ` [PATCH 16/18] iwlwifi: update lowest API version support for 6x00 & 6x50 series Reinette Chatre
2009-10-23 20:42 ` [PATCH 17/18] iwlwifi: make sure device is reset when unloading driver Reinette Chatre
2009-10-23 20:42 ` [PATCH 18/18] iwlwifi: minor comments changes for wimax co-exist command 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=1256330556-20997-9-git-send-email-reinette.chatre@intel.com \
--to=reinette.chatre@intel.com \
--cc=ipw3945-devel@lists.sourceforge.net \
--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