svn commit: r318230 - head/sys/dev/iwm

[Adrian Chadd]

Author: adrian
Date: Fri May 12 06:33:55 2017
New Revision: 318230
URL: https://svnweb.freebsd.org/changeset/base/318230

Log:
  [iwm] Fix iwm_mvm_send_cmd_pdu(_status) declarations. Make id a uint32_t.
  
  * This fixes cases where the group id of wide commands got lost, e.g. this
    happened to the IWM_SCAN_ABORT_UMAC command.
  
  Obtained from:	dragonflybsd.git 71310fab0caca79bb5da43d9d642e77a4c27eea2

Modified:
  head/sys/dev/iwm/if_iwm_util.c
  head/sys/dev/iwm/if_iwm_util.h

Modified: head/sys/dev/iwm/if_iwm_util.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_util.c	Fri May 12 06:33:07 2017	(r318229)
+++ head/sys/dev/iwm/if_iwm_util.c	Fri May 12 06:33:55 2017	(r318230)
@@ -346,7 +346,7 @@ iwm_send_cmd(struct iwm_softc *sc, struc
 
 /* iwlwifi: mvm/utils.c */
 int
-iwm_mvm_send_cmd_pdu(struct iwm_softc *sc, uint8_t id,
+iwm_mvm_send_cmd_pdu(struct iwm_softc *sc, uint32_t id,
 	uint32_t flags, uint16_t len, const void *data)
 {
 	struct iwm_host_cmd cmd = {
@@ -402,7 +402,7 @@ iwm_mvm_send_cmd_status(struct iwm_softc
 
 /* iwlwifi/mvm/utils.c */
 int
-iwm_mvm_send_cmd_pdu_status(struct iwm_softc *sc, uint8_t id,
+iwm_mvm_send_cmd_pdu_status(struct iwm_softc *sc, uint32_t id,
 	uint16_t len, const void *data, uint32_t *status)
 {
 	struct iwm_host_cmd cmd = {

Modified: head/sys/dev/iwm/if_iwm_util.h
==============================================================================
--- head/sys/dev/iwm/if_iwm_util.h	Fri May 12 06:33:07 2017	(r318229)
+++ head/sys/dev/iwm/if_iwm_util.h	Fri May 12 06:33:55 2017	(r318230)
@@ -107,12 +107,12 @@
 #define	__IF_IWM_UTIL_H__
 
 extern	int iwm_send_cmd(struct iwm_softc *sc, struct iwm_host_cmd *hcmd);
-extern	int iwm_mvm_send_cmd_pdu(struct iwm_softc *sc, uint8_t id,
+extern	int iwm_mvm_send_cmd_pdu(struct iwm_softc *sc, uint32_t id,
 	    uint32_t flags, uint16_t len, const void *data);
 
 extern	int iwm_mvm_send_cmd_status(struct iwm_softc *sc,
 	    struct iwm_host_cmd *cmd, uint32_t *status);
-extern	int iwm_mvm_send_cmd_pdu_status(struct iwm_softc *sc, uint8_t id,
+extern	int iwm_mvm_send_cmd_pdu_status(struct iwm_softc *sc, uint32_t id,
 	uint16_t len, const void *data, uint32_t *status);
 extern	void iwm_free_resp(struct iwm_softc *sc, struct iwm_host_cmd *hcmd);