Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cc589b9 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

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: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea9edaf6

drivers/net/wireless/iwmc3200wifi/rx.c

+0 −1
Original line number Diff line number Diff line
@@ -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));

drivers/net/wireless/iwmc3200wifi/umac.h

+6 −0
Original line number Diff line number Diff line
@@ -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 {