svn commit: r330146 - stable/11/sys/dev/iwm

[Eitan Adler]

Author: eadler
Date: Thu Mar  1 04:43:52 2018
New Revision: 330146
URL: https://svnweb.freebsd.org/changeset/base/330146

Log:
  MFC r306000
  
  [iwm] Remove unused field from iwm_rx_data. Use uint32_t instead of enum type.
  
  The wantresp field in struct iwm_rx_data has never been used for anything,
  so we can just delete it.
  
  Apparently struct iwm_sf_cfg_cmd was compiled correctly (using a 32bit
  value to represent the enum), but it still seems like a very bad idea to use
  an enum type in a __packed struct.

Modified:
  stable/11/sys/dev/iwm/if_iwmreg.h
  stable/11/sys/dev/iwm/if_iwmvar.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/iwm/if_iwmreg.h
==============================================================================
--- stable/11/sys/dev/iwm/if_iwmreg.h	Thu Mar  1 04:28:54 2018	(r330145)
+++ stable/11/sys/dev/iwm/if_iwmreg.h	Thu Mar  1 04:43:52 2018	(r330146)
@@ -3251,7 +3251,7 @@ enum iwm_sf_scenario {
  * @full_on_timeouts: timer values for each scenario in full on state.
  */
 struct iwm_sf_cfg_cmd {
-	enum iwm_sf_state state;
+	uint32_t state;
 	uint32_t watermark[IWM_SF_TRANSIENT_STATES_NUMBER];
 	uint32_t long_delay_timeouts[IWM_SF_NUM_SCENARIO][IWM_SF_NUM_TIMEOUT_TYPES];
 	uint32_t full_on_timeouts[IWM_SF_NUM_SCENARIO][IWM_SF_NUM_TIMEOUT_TYPES];

Modified: stable/11/sys/dev/iwm/if_iwmvar.h
==============================================================================
--- stable/11/sys/dev/iwm/if_iwmvar.h	Thu Mar  1 04:28:54 2018	(r330145)
+++ stable/11/sys/dev/iwm/if_iwmvar.h	Thu Mar  1 04:43:52 2018	(r330146)
@@ -275,7 +275,6 @@ struct iwm_tx_ring {
 struct iwm_rx_data {
 	struct mbuf	*m;
 	bus_dmamap_t	map;
-	int		wantresp;
 };
 
 struct iwm_rx_ring {