From 288315ffc7fd83fad66ee740ee46e1db64cce67a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Imre=20Vad=C3=A1sz?= Date: Sun, 28 Aug 2016 15:29:09 +0200 Subject: [PATCH] if_iwm - Fix comments and struct definition for struct iwm_sf_cfg_cmd. * Use uint32_t instead of "enum iwm_sf_state" for the state field in struct iwm_sf_cfg_cmd, because that struct is declared __packed. Taken-From: FreeBSD (the typos in struct iwm_sf_cfg_cmd comments) --- sys/dev/netif/iwm/if_iwmreg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/netif/iwm/if_iwmreg.h b/sys/dev/netif/iwm/if_iwmreg.h index 2a37972e90..7ccfe98e71 100644 --- a/sys/dev/netif/iwm/if_iwmreg.h +++ b/sys/dev/netif/iwm/if_iwmreg.h @@ -3175,7 +3175,7 @@ enum iwm_sf_scenario { #define IWM_SF_SINGLE_UNICAST_AGING_TIMER_DEF 400 /* 0.4 mSec */ #define IWM_SF_AGG_UNICAST_IDLE_TIMER_DEF 160 /* 150 uSec */ #define IWM_SF_AGG_UNICAST_AGING_TIMER_DEF 400 /* 0.4 mSec */ -#define IWM_SF_MCAST_IDLE_TIMER_DEF 160 /* 150 mSec */ +#define IWM_SF_MCAST_IDLE_TIMER_DEF 160 /* 150 uSec */ #define IWM_SF_MCAST_AGING_TIMER_DEF 400 /* 0.4 mSec */ #define IWM_SF_BA_IDLE_TIMER_DEF 160 /* 150 uSec */ #define IWM_SF_BA_AGING_TIMER_DEF 400 /* 0.4 mSec */ @@ -3200,14 +3200,14 @@ enum iwm_sf_scenario { /** * Smart Fifo configuration command. - * @state: smart fifo state, types listed in iwm_sf_sate. + * @state: smart fifo state, types listed in enum %iwm_sf_state. * @watermark: Minimum allowed available free space in RXF for transient state. * @long_delay_timeouts: aging and idle timer values for each scenario * in long delay state. * @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]; -- 2.41.0