public inbox for linux-wireless@vger.kernel.org
 help / color / mirror / Atom feed
From: Zhu Yi <yi.zhu@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, Zhu Yi <yi.zhu@intel.com>
Subject: [PATCH 01/10] iwmc3200wifi: fix UMAC INIT_COMPLETE notification handling
Date: Thu, 16 Jul 2009 17:34:06 +0800	[thread overview]
Message-ID: <1247736854-6760-2-git-send-email-yi.zhu@intel.com> (raw)
In-Reply-To: <1247736854-6760-1-git-send-email-yi.zhu@intel.com>

The patch fixes the missing UMAC iwm_umac_wifi_in_hdr header in
the UMAC INIT_COMPLETE (iwm_umac_notif_init_complete) notification.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
 drivers/net/wireless/iwmc3200wifi/rx.c   |    1 -
 drivers/net/wireless/iwmc3200wifi/umac.h |    6 ++++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 3909477..59ef69c 100644
--- a/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -102,7 +102,6 @@ static int iwm_ntf_error(struct iwm_priv *iwm, u8 *buf,
 	error = (struct iwm_umac_notif_error *)buf;
 	fw_err = &error->err;
 
-
 	IWM_ERR(iwm, "%cMAC FW ERROR:\n",
 	 (le32_to_cpu(fw_err->category) == UMAC_SYS_ERR_CAT_LMAC) ? 'L' : 'U');
 	IWM_ERR(iwm, "\tCategory:    %d\n", le32_to_cpu(fw_err->category));
diff --git a/drivers/net/wireless/iwmc3200wifi/umac.h b/drivers/net/wireless/iwmc3200wifi/umac.h
index 0af2a3c..c5a14ae 100644
--- a/drivers/net/wireless/iwmc3200wifi/umac.h
+++ b/drivers/net/wireless/iwmc3200wifi/umac.h
@@ -615,6 +615,7 @@ struct iwm_umac_notif_alive {
 } __attribute__ ((packed));
 
 struct iwm_umac_notif_init_complete {
+	struct iwm_umac_wifi_in_hdr hdr;
 	__le16 status;
 	__le16 reserved;
 } __attribute__ ((packed));
@@ -643,6 +644,11 @@ struct iwm_fw_error_hdr {
 	__le32 umac_status;
 	__le32 lmac_status;
 	__le32 sdio_status;
+	__le32 dbm_sample_ctrl;
+	__le32 dbm_buf_base;
+	__le32 dbm_buf_end;
+	__le32 dbm_buf_write_ptr;
+	__le32 dbm_buf_cycle_cnt;
 } __attribute__ ((packed));
 
 struct iwm_umac_notif_error {
-- 
1.6.0.4


  reply	other threads:[~2009-07-16  9:33 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-16  9:34 [PATCH 00/09] iwmc3200wifi updates Zhu Yi
2009-07-16  9:34 ` Zhu Yi [this message]
2009-07-16  9:34   ` [PATCH 02/10] iwmc3200wifi: hardware does not support IP checksum Zhu Yi
2009-07-16  9:34     ` [PATCH 03/10] iwmc3200wifi: set cipher_suites before registering wiphy Zhu Yi
2009-07-16  9:34       ` [PATCH 04/10] iwmc3200wifi: use correct debug level Zhu Yi
2009-07-16  9:34         ` [PATCH 05/10] iwmc3200wifi: cfg80211 managed mode port Zhu Yi
2009-07-16  9:34           ` [PATCH 06/10] iwmc3200wifi: remove setting WEP keys before setting essid support Zhu Yi
2009-07-16  9:34             ` [PATCH 07/10] iwmc3200wifi: make iwm_send_wifi_if_cmd return 0 on success Zhu Yi
2009-07-16  9:34               ` [PATCH 08/10] iwmc3200wifi: remove key caches in driver Zhu Yi
2009-07-16  9:34                 ` [PATCH 09/10] cfg80211: remove WARN_ON in __cfg80211_sme_scan_done Zhu Yi
2009-07-16  9:39                   ` Johannes Berg

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=1247736854-6760-2-git-send-email-yi.zhu@intel.com \
    --to=yi.zhu@intel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.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