Skip to content

Commit

Permalink
iwmc3200wifi: fix UMAC INIT_COMPLETE notification handling
Browse files Browse the repository at this point in the history 
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Zhu Yi authored and John W. Linville committed Jul 24, 2009
1 parent ea9edaf commit 1cc589b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/net/wireless/iwmc3200wifi/rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
6 changes: 6 additions & 0 deletions drivers/net/wireless/iwmc3200wifi/umac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 1cc589b

Please sign in to comment.