iwmc3200wifi: fix UMAC INIT_COMPLETE notification handling

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>

diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 3909477fb3bf0c8b3d06ef4e63111a73b604785b..59ef69ca3ca711e17bb4b6d3747d2d1d15b4438f 100644 (file)
--- 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 0af2a3c762818821c7d89ccbe9da9944efd9ca9c..c5a14ae3160adc1d01dd98a94f9f4175b8233648 100644 (file)
--- 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 {