aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/rx.c1
-rw-r--r--drivers/net/wireless/iwmc3200wifi/umac.h6
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 3909477fb3bf..59ef69ca3ca7 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,
102 error = (struct iwm_umac_notif_error *)buf; 102 error = (struct iwm_umac_notif_error *)buf;
103 fw_err = &error->err; 103 fw_err = &error->err;
104 104
105
106 IWM_ERR(iwm, "%cMAC FW ERROR:\n", 105 IWM_ERR(iwm, "%cMAC FW ERROR:\n",
107 (le32_to_cpu(fw_err->category) == UMAC_SYS_ERR_CAT_LMAC) ? 'L' : 'U'); 106 (le32_to_cpu(fw_err->category) == UMAC_SYS_ERR_CAT_LMAC) ? 'L' : 'U');
108 IWM_ERR(iwm, "\tCategory: %d\n", le32_to_cpu(fw_err->category)); 107 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 0af2a3c76281..c5a14ae3160a 100644
--- a/drivers/net/wireless/iwmc3200wifi/umac.h
+++ b/drivers/net/wireless/iwmc3200wifi/umac.h
@@ -615,6 +615,7 @@ struct iwm_umac_notif_alive {
615} __attribute__ ((packed)); 615} __attribute__ ((packed));
616 616
617struct iwm_umac_notif_init_complete { 617struct iwm_umac_notif_init_complete {
618 struct iwm_umac_wifi_in_hdr hdr;
618 __le16 status; 619 __le16 status;
619 __le16 reserved; 620 __le16 reserved;
620} __attribute__ ((packed)); 621} __attribute__ ((packed));
@@ -643,6 +644,11 @@ struct iwm_fw_error_hdr {
643 __le32 umac_status; 644 __le32 umac_status;
644 __le32 lmac_status; 645 __le32 lmac_status;
645 __le32 sdio_status; 646 __le32 sdio_status;
647 __le32 dbm_sample_ctrl;
648 __le32 dbm_buf_base;
649 __le32 dbm_buf_end;
650 __le32 dbm_buf_write_ptr;
651 __le32 dbm_buf_cycle_cnt;
646} __attribute__ ((packed)); 652} __attribute__ ((packed));
647 653
648struct iwm_umac_notif_error { 654struct iwm_umac_notif_error {