diff options
author | Joe Perches <joe@perches.com> | 2011-02-02 17:05:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 17:34:50 -0500 |
commit | cb1e370987c3651707e30e404e41ebdc83571fba (patch) | |
tree | e54f7c8715a48dddf118af9fb5ef04694b2a8478 /drivers | |
parent | f2ab1275cb1cfd033868cf0b7c67d1143199630e (diff) |
staging: ath6kl: Convert A_INT16 to s16
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/ath6kl/include/common/wmi.h | 36 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/wlan_api.h | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 24 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_pm.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h | 6 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/athdrv_linux.h | 10 | ||||
-rw-r--r-- | drivers/staging/ath6kl/wmi/wmi.c | 18 | ||||
-rw-r--r-- | drivers/staging/ath6kl/wmi/wmi_host.h | 4 |
8 files changed, 50 insertions, 52 deletions
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h index 2fb03bea403..12ca0254e8e 100644 --- a/drivers/staging/ath6kl/include/common/wmi.h +++ b/drivers/staging/ath6kl/include/common/wmi.h | |||
@@ -996,18 +996,18 @@ typedef PREPACK struct { | |||
996 | 996 | ||
997 | typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{ | 997 | typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{ |
998 | u32 pollTime; /* Polling time as a factor of LI */ | 998 | u32 pollTime; /* Polling time as a factor of LI */ |
999 | A_INT16 thresholdAbove1_Val; /* lowest of upper */ | 999 | s16 thresholdAbove1_Val; /* lowest of upper */ |
1000 | A_INT16 thresholdAbove2_Val; | 1000 | s16 thresholdAbove2_Val; |
1001 | A_INT16 thresholdAbove3_Val; | 1001 | s16 thresholdAbove3_Val; |
1002 | A_INT16 thresholdAbove4_Val; | 1002 | s16 thresholdAbove4_Val; |
1003 | A_INT16 thresholdAbove5_Val; | 1003 | s16 thresholdAbove5_Val; |
1004 | A_INT16 thresholdAbove6_Val; /* highest of upper */ | 1004 | s16 thresholdAbove6_Val; /* highest of upper */ |
1005 | A_INT16 thresholdBelow1_Val; /* lowest of bellow */ | 1005 | s16 thresholdBelow1_Val; /* lowest of bellow */ |
1006 | A_INT16 thresholdBelow2_Val; | 1006 | s16 thresholdBelow2_Val; |
1007 | A_INT16 thresholdBelow3_Val; | 1007 | s16 thresholdBelow3_Val; |
1008 | A_INT16 thresholdBelow4_Val; | 1008 | s16 thresholdBelow4_Val; |
1009 | A_INT16 thresholdBelow5_Val; | 1009 | s16 thresholdBelow5_Val; |
1010 | A_INT16 thresholdBelow6_Val; /* highest of bellow */ | 1010 | s16 thresholdBelow6_Val; /* highest of bellow */ |
1011 | u8 weight; /* "alpha" */ | 1011 | u8 weight; /* "alpha" */ |
1012 | u8 reserved[3]; | 1012 | u8 reserved[3]; |
1013 | } POSTPACK WMI_RSSI_THRESHOLD_PARAMS_CMD; | 1013 | } POSTPACK WMI_RSSI_THRESHOLD_PARAMS_CMD; |
@@ -1209,8 +1209,8 @@ typedef PREPACK struct { | |||
1209 | 1209 | ||
1210 | typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS { | 1210 | typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS { |
1211 | u16 lowrssi_scan_period; | 1211 | u16 lowrssi_scan_period; |
1212 | A_INT16 lowrssi_scan_threshold; | 1212 | s16 lowrssi_scan_threshold; |
1213 | A_INT16 lowrssi_roam_threshold; | 1213 | s16 lowrssi_roam_threshold; |
1214 | u8 roam_rssi_floor; | 1214 | u8 roam_rssi_floor; |
1215 | u8 reserved[1]; /* For alignment */ | 1215 | u8 reserved[1]; /* For alignment */ |
1216 | } POSTPACK WMI_LOWRSSI_SCAN_PARAMS; | 1216 | } POSTPACK WMI_LOWRSSI_SCAN_PARAMS; |
@@ -2062,7 +2062,7 @@ typedef PREPACK struct { | |||
2062 | u16 channel; | 2062 | u16 channel; |
2063 | u8 frameType; /* see WMI_BI_FTYPE */ | 2063 | u8 frameType; /* see WMI_BI_FTYPE */ |
2064 | u8 snr; | 2064 | u8 snr; |
2065 | A_INT16 rssi; | 2065 | s16 rssi; |
2066 | u8 bssid[ATH_MAC_LEN]; | 2066 | u8 bssid[ATH_MAC_LEN]; |
2067 | u32 ieMask; | 2067 | u32 ieMask; |
2068 | } POSTPACK WMI_BSS_INFO_HDR; | 2068 | } POSTPACK WMI_BSS_INFO_HDR; |
@@ -2277,9 +2277,9 @@ typedef PREPACK struct { | |||
2277 | u32 cs_lowRssi_cnt; | 2277 | u32 cs_lowRssi_cnt; |
2278 | u16 cs_connect_cnt; | 2278 | u16 cs_connect_cnt; |
2279 | u16 cs_disconnect_cnt; | 2279 | u16 cs_disconnect_cnt; |
2280 | A_INT16 cs_aveBeacon_rssi; | 2280 | s16 cs_aveBeacon_rssi; |
2281 | u16 cs_roam_count; | 2281 | u16 cs_roam_count; |
2282 | A_INT16 cs_rssi; | 2282 | s16 cs_rssi; |
2283 | u8 cs_snr; | 2283 | u8 cs_snr; |
2284 | u8 cs_aveBeacon_snr; | 2284 | u8 cs_aveBeacon_snr; |
2285 | u8 cs_lastRoam_msec; | 2285 | u8 cs_lastRoam_msec; |
@@ -2335,7 +2335,7 @@ typedef enum{ | |||
2335 | }WMI_RSSI_THRESHOLD_VAL; | 2335 | }WMI_RSSI_THRESHOLD_VAL; |
2336 | 2336 | ||
2337 | typedef PREPACK struct { | 2337 | typedef PREPACK struct { |
2338 | A_INT16 rssi; | 2338 | s16 rssi; |
2339 | u8 range; | 2339 | u8 range; |
2340 | }POSTPACK WMI_RSSI_THRESHOLD_EVENT; | 2340 | }POSTPACK WMI_RSSI_THRESHOLD_EVENT; |
2341 | 2341 | ||
diff --git a/drivers/staging/ath6kl/include/wlan_api.h b/drivers/staging/ath6kl/include/wlan_api.h index ce799683725..ba5493c98a7 100644 --- a/drivers/staging/ath6kl/include/wlan_api.h +++ b/drivers/staging/ath6kl/include/wlan_api.h | |||
@@ -61,7 +61,7 @@ struct ieee80211_common_ie { | |||
61 | typedef struct bss { | 61 | typedef struct bss { |
62 | u8 ni_macaddr[6]; | 62 | u8 ni_macaddr[6]; |
63 | u8 ni_snr; | 63 | u8 ni_snr; |
64 | A_INT16 ni_rssi; | 64 | s16 ni_rssi; |
65 | struct bss *ni_list_next; | 65 | struct bss *ni_list_next; |
66 | struct bss *ni_list_prev; | 66 | struct bss *ni_list_prev; |
67 | struct bss *ni_hash_next; | 67 | struct bss *ni_hash_next; |
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index d527cee25d1..651f9f4b665 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -260,16 +260,16 @@ typedef struct user_rssi_compensation_t { | |||
260 | u16 bg_enable; | 260 | u16 bg_enable; |
261 | u16 enable; | 261 | u16 enable; |
262 | }; | 262 | }; |
263 | A_INT16 bg_param_a; | 263 | s16 bg_param_a; |
264 | A_INT16 bg_param_b; | 264 | s16 bg_param_b; |
265 | A_INT16 a_param_a; | 265 | s16 a_param_a; |
266 | A_INT16 a_param_b; | 266 | s16 a_param_b; |
267 | u32 reserved; | 267 | u32 reserved; |
268 | } USER_RSSI_CPENSATION; | 268 | } USER_RSSI_CPENSATION; |
269 | 269 | ||
270 | static USER_RSSI_CPENSATION rssi_compensation_param; | 270 | static USER_RSSI_CPENSATION rssi_compensation_param; |
271 | 271 | ||
272 | static A_INT16 rssi_compensation_table[96]; | 272 | static s16 rssi_compensation_table[96]; |
273 | 273 | ||
274 | int reconnect_flag = 0; | 274 | int reconnect_flag = 0; |
275 | static ar6k_pal_config_t ar6k_pal_config_g; | 275 | static ar6k_pal_config_t ar6k_pal_config_g; |
@@ -2430,7 +2430,7 @@ int ar6000_init(struct net_device *dev) | |||
2430 | AR_SOFTC_T *ar; | 2430 | AR_SOFTC_T *ar; |
2431 | int status; | 2431 | int status; |
2432 | A_INT32 timeleft; | 2432 | A_INT32 timeleft; |
2433 | A_INT16 i; | 2433 | s16 i; |
2434 | int ret = 0; | 2434 | int ret = 0; |
2435 | #if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE) | 2435 | #if defined(INIT_MODE_DRV_ENABLED) && defined(ENABLE_COEXISTENCE) |
2436 | WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD sbcb_cmd; | 2436 | WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD sbcb_cmd; |
@@ -5030,7 +5030,7 @@ ar6000_targetStats_event(AR_SOFTC_T *ar, u8 *ptr, u32 len) | |||
5030 | } | 5030 | } |
5031 | 5031 | ||
5032 | void | 5032 | void |
5033 | ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, A_INT16 rssi) | 5033 | ar6000_rssiThreshold_event(AR_SOFTC_T *ar, WMI_RSSI_THRESHOLD_VAL newThreshold, s16 rssi) |
5034 | { | 5034 | { |
5035 | USER_RSSI_THOLD userRssiThold; | 5035 | USER_RSSI_THOLD userRssiThold; |
5036 | 5036 | ||
@@ -5791,7 +5791,7 @@ read_rssi_compensation_param(AR_SOFTC_T *ar) | |||
5791 | //#define RSSICOMPENSATION_PRINT | 5791 | //#define RSSICOMPENSATION_PRINT |
5792 | 5792 | ||
5793 | #ifdef RSSICOMPENSATION_PRINT | 5793 | #ifdef RSSICOMPENSATION_PRINT |
5794 | A_INT16 i; | 5794 | s16 i; |
5795 | cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType); | 5795 | cust_data_ptr = ar6000_get_cust_data_buffer(ar->arTargetType); |
5796 | for (i=0; i<16; i++) { | 5796 | for (i=0; i<16; i++) { |
5797 | A_PRINTF("cust_data_%d = %x \n", i, *(u8 *)cust_data_ptr); | 5797 | A_PRINTF("cust_data_%d = %x \n", i, *(u8 *)cust_data_ptr); |
@@ -5856,8 +5856,7 @@ rssi_compensation_calc_tcmd(u32 freq, A_INT32 rssi, u32 totalPkt) | |||
5856 | return rssi; | 5856 | return rssi; |
5857 | } | 5857 | } |
5858 | 5858 | ||
5859 | A_INT16 | 5859 | s16 rssi_compensation_calc(AR_SOFTC_T *ar, s16 rssi) |
5860 | rssi_compensation_calc(AR_SOFTC_T *ar, A_INT16 rssi) | ||
5861 | { | 5860 | { |
5862 | if (ar->arBssChannel > 5000) | 5861 | if (ar->arBssChannel > 5000) |
5863 | { | 5862 | { |
@@ -5885,10 +5884,9 @@ rssi_compensation_calc(AR_SOFTC_T *ar, A_INT16 rssi) | |||
5885 | return rssi; | 5884 | return rssi; |
5886 | } | 5885 | } |
5887 | 5886 | ||
5888 | A_INT16 | 5887 | s16 rssi_compensation_reverse_calc(AR_SOFTC_T *ar, s16 rssi, bool Above) |
5889 | rssi_compensation_reverse_calc(AR_SOFTC_T *ar, A_INT16 rssi, bool Above) | ||
5890 | { | 5888 | { |
5891 | A_INT16 i; | 5889 | s16 i; |
5892 | 5890 | ||
5893 | if (ar->arBssChannel > 5000) | 5891 | if (ar->arBssChannel > 5000) |
5894 | { | 5892 | { |
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c index 691e535403a..0995bbbb4e3 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c | |||
@@ -215,7 +215,7 @@ int ar6000_suspend_ev(void *context) | |||
215 | { | 215 | { |
216 | int status = A_OK; | 216 | int status = A_OK; |
217 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; | 217 | AR_SOFTC_T *ar = (AR_SOFTC_T *)context; |
218 | A_INT16 pmmode = ar->arSuspendConfig; | 218 | s16 pmmode = ar->arSuspendConfig; |
219 | wow_not_connected: | 219 | wow_not_connected: |
220 | switch (pmmode) { | 220 | switch (pmmode) { |
221 | case WLAN_SUSPEND_WOW: | 221 | case WLAN_SUSPEND_WOW: |
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h index bd62141b89e..328982fb3a9 100644 --- a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h +++ b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h | |||
@@ -54,7 +54,7 @@ void ar6000_scanComplete_event(struct ar6_softc *ar, int status); | |||
54 | void ar6000_targetStats_event(struct ar6_softc *ar, u8 *ptr, u32 len); | 54 | void ar6000_targetStats_event(struct ar6_softc *ar, u8 *ptr, u32 len); |
55 | void ar6000_rssiThreshold_event(struct ar6_softc *ar, | 55 | void ar6000_rssiThreshold_event(struct ar6_softc *ar, |
56 | WMI_RSSI_THRESHOLD_VAL newThreshold, | 56 | WMI_RSSI_THRESHOLD_VAL newThreshold, |
57 | A_INT16 rssi); | 57 | s16 rssi); |
58 | void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal); | 58 | void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal); |
59 | void ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cac_indication, | 59 | void ar6000_cac_event(struct ar6_softc *ar, u8 ac, u8 cac_indication, |
60 | u8 statusCode, u8 *tspecSuggestion); | 60 | u8 statusCode, u8 *tspecSuggestion); |
@@ -78,8 +78,8 @@ void ar6000_gpio_data_rx(u32 reg_id, u32 value); | |||
78 | void ar6000_gpio_ack_rx(void); | 78 | void ar6000_gpio_ack_rx(void); |
79 | 79 | ||
80 | A_INT32 rssi_compensation_calc_tcmd(u32 freq, A_INT32 rssi, u32 totalPkt); | 80 | A_INT32 rssi_compensation_calc_tcmd(u32 freq, A_INT32 rssi, u32 totalPkt); |
81 | A_INT16 rssi_compensation_calc(struct ar6_softc *ar, A_INT16 rssi); | 81 | s16 rssi_compensation_calc(struct ar6_softc *ar, s16 rssi); |
82 | A_INT16 rssi_compensation_reverse_calc(struct ar6_softc *ar, A_INT16 rssi, bool Above); | 82 | s16 rssi_compensation_reverse_calc(struct ar6_softc *ar, s16 rssi, bool Above); |
83 | 83 | ||
84 | void ar6000_dbglog_init_done(struct ar6_softc *ar); | 84 | void ar6000_dbglog_init_done(struct ar6_softc *ar); |
85 | 85 | ||
diff --git a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h index a345ecd319b..a3e65081f98 100644 --- a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h +++ b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h | |||
@@ -1069,9 +1069,9 @@ typedef struct targetStats_t { | |||
1069 | u32 wow_num_pkts_dropped; | 1069 | u32 wow_num_pkts_dropped; |
1070 | u16 wow_num_events_discarded; | 1070 | u16 wow_num_events_discarded; |
1071 | 1071 | ||
1072 | A_INT16 noise_floor_calibation; | 1072 | s16 noise_floor_calibation; |
1073 | A_INT16 cs_rssi; | 1073 | s16 cs_rssi; |
1074 | A_INT16 cs_aveBeacon_rssi; | 1074 | s16 cs_aveBeacon_rssi; |
1075 | u8 cs_aveBeacon_snr; | 1075 | u8 cs_aveBeacon_snr; |
1076 | u8 cs_lastRoam_msec; | 1076 | u8 cs_lastRoam_msec; |
1077 | u8 cs_snr; | 1077 | u8 cs_snr; |
@@ -1139,8 +1139,8 @@ typedef struct ar6000_dbglog_module_config_s { | |||
1139 | } DBGLOG_MODULE_CONFIG; | 1139 | } DBGLOG_MODULE_CONFIG; |
1140 | 1140 | ||
1141 | typedef struct user_rssi_thold_t { | 1141 | typedef struct user_rssi_thold_t { |
1142 | A_INT16 tag; | 1142 | s16 tag; |
1143 | A_INT16 rssi; | 1143 | s16 rssi; |
1144 | } USER_RSSI_THOLD; | 1144 | } USER_RSSI_THOLD; |
1145 | 1145 | ||
1146 | typedef struct user_rssi_params_t { | 1146 | typedef struct user_rssi_params_t { |
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c index f5f9aa1a535..b80bdb7e764 100644 --- a/drivers/staging/ath6kl/wmi/wmi.c +++ b/drivers/staging/ath6kl/wmi/wmi.c | |||
@@ -166,8 +166,8 @@ static int wmi_keepalive_reply_rx(struct wmi_t *wmip, u8 *datap, int len); | |||
166 | int wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMIX_COMMAND_ID cmdId, | 166 | int wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMIX_COMMAND_ID cmdId, |
167 | WMI_SYNC_FLAG syncflag); | 167 | WMI_SYNC_FLAG syncflag); |
168 | 168 | ||
169 | u8 ar6000_get_upper_threshold(A_INT16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, u32 size); | 169 | u8 ar6000_get_upper_threshold(s16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, u32 size); |
170 | u8 ar6000_get_lower_threshold(A_INT16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, u32 size); | 170 | u8 ar6000_get_lower_threshold(s16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, u32 size); |
171 | 171 | ||
172 | void wmi_cache_configure_rssithreshold(struct wmi_t *wmip, WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd); | 172 | void wmi_cache_configure_rssithreshold(struct wmi_t *wmip, WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd); |
173 | void wmi_cache_configure_snrthreshold(struct wmi_t *wmip, WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd); | 173 | void wmi_cache_configure_snrthreshold(struct wmi_t *wmip, WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd); |
@@ -281,7 +281,7 @@ typedef PREPACK struct _iphdr { | |||
281 | u8 ip_tos; /* type of service */ | 281 | u8 ip_tos; /* type of service */ |
282 | u16 ip_len; /* total length */ | 282 | u16 ip_len; /* total length */ |
283 | u16 ip_id; /* identification */ | 283 | u16 ip_id; /* identification */ |
284 | A_INT16 ip_off; /* fragment offset field */ | 284 | s16 ip_off; /* fragment offset field */ |
285 | #define IP_DF 0x4000 /* dont fragment flag */ | 285 | #define IP_DF 0x4000 /* dont fragment flag */ |
286 | #define IP_MF 0x2000 /* more fragments flag */ | 286 | #define IP_MF 0x2000 /* more fragments flag */ |
287 | #define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ | 287 | #define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ |
@@ -294,8 +294,8 @@ typedef PREPACK struct _iphdr { | |||
294 | 294 | ||
295 | #include "athendpack.h" | 295 | #include "athendpack.h" |
296 | 296 | ||
297 | static A_INT16 rssi_event_value = 0; | 297 | static s16 rssi_event_value = 0; |
298 | static A_INT16 snr_event_value = 0; | 298 | static s16 snr_event_value = 0; |
299 | 299 | ||
300 | bool is_probe_ssid = false; | 300 | bool is_probe_ssid = false; |
301 | 301 | ||
@@ -1874,7 +1874,7 @@ wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, u8 *datap, int len) | |||
1874 | SQ_THRESHOLD_PARAMS *sq_thresh = | 1874 | SQ_THRESHOLD_PARAMS *sq_thresh = |
1875 | &wmip->wmi_SqThresholdParams[SIGNAL_QUALITY_METRICS_RSSI]; | 1875 | &wmip->wmi_SqThresholdParams[SIGNAL_QUALITY_METRICS_RSSI]; |
1876 | u8 upper_rssi_threshold, lower_rssi_threshold; | 1876 | u8 upper_rssi_threshold, lower_rssi_threshold; |
1877 | A_INT16 rssi; | 1877 | s16 rssi; |
1878 | 1878 | ||
1879 | if (len < sizeof(*reply)) { | 1879 | if (len < sizeof(*reply)) { |
1880 | return A_EINVAL; | 1880 | return A_EINVAL; |
@@ -2143,7 +2143,7 @@ wmi_snrThresholdEvent_rx(struct wmi_t *wmip, u8 *datap, int len) | |||
2143 | WMI_SNR_THRESHOLD_VAL newThreshold; | 2143 | WMI_SNR_THRESHOLD_VAL newThreshold; |
2144 | WMI_SNR_THRESHOLD_PARAMS_CMD cmd; | 2144 | WMI_SNR_THRESHOLD_PARAMS_CMD cmd; |
2145 | u8 upper_snr_threshold, lower_snr_threshold; | 2145 | u8 upper_snr_threshold, lower_snr_threshold; |
2146 | A_INT16 snr; | 2146 | s16 snr; |
2147 | 2147 | ||
2148 | if (len < sizeof(*reply)) { | 2148 | if (len < sizeof(*reply)) { |
2149 | return A_EINVAL; | 2149 | return A_EINVAL; |
@@ -5882,7 +5882,7 @@ wmi_scan_indication (struct wmi_t *wmip) | |||
5882 | } | 5882 | } |
5883 | #endif | 5883 | #endif |
5884 | 5884 | ||
5885 | u8 ar6000_get_upper_threshold(A_INT16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, | 5885 | u8 ar6000_get_upper_threshold(s16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, |
5886 | u32 size) | 5886 | u32 size) |
5887 | { | 5887 | { |
5888 | u32 index; | 5888 | u32 index; |
@@ -5899,7 +5899,7 @@ u8 ar6000_get_upper_threshold(A_INT16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, | |||
5899 | return threshold; | 5899 | return threshold; |
5900 | } | 5900 | } |
5901 | 5901 | ||
5902 | u8 ar6000_get_lower_threshold(A_INT16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, | 5902 | u8 ar6000_get_lower_threshold(s16 rssi, SQ_THRESHOLD_PARAMS *sq_thresh, |
5903 | u32 size) | 5903 | u32 size) |
5904 | { | 5904 | { |
5905 | u32 index; | 5905 | u32 index; |
diff --git a/drivers/staging/ath6kl/wmi/wmi_host.h b/drivers/staging/ath6kl/wmi/wmi_host.h index ed8335fa7c5..53e4f085dfe 100644 --- a/drivers/staging/ath6kl/wmi/wmi_host.h +++ b/drivers/staging/ath6kl/wmi/wmi_host.h | |||
@@ -42,8 +42,8 @@ struct wmi_stats { | |||
42 | #define SIGNAL_QUALITY_UPPER_THRESHOLD_LEVELS SIGNAL_QUALITY_THRESHOLD_LEVELS | 42 | #define SIGNAL_QUALITY_UPPER_THRESHOLD_LEVELS SIGNAL_QUALITY_THRESHOLD_LEVELS |
43 | #define SIGNAL_QUALITY_LOWER_THRESHOLD_LEVELS SIGNAL_QUALITY_THRESHOLD_LEVELS | 43 | #define SIGNAL_QUALITY_LOWER_THRESHOLD_LEVELS SIGNAL_QUALITY_THRESHOLD_LEVELS |
44 | typedef struct sq_threshold_params_s { | 44 | typedef struct sq_threshold_params_s { |
45 | A_INT16 upper_threshold[SIGNAL_QUALITY_UPPER_THRESHOLD_LEVELS]; | 45 | s16 upper_threshold[SIGNAL_QUALITY_UPPER_THRESHOLD_LEVELS]; |
46 | A_INT16 lower_threshold[SIGNAL_QUALITY_LOWER_THRESHOLD_LEVELS]; | 46 | s16 lower_threshold[SIGNAL_QUALITY_LOWER_THRESHOLD_LEVELS]; |
47 | u32 upper_threshold_valid_count; | 47 | u32 upper_threshold_valid_count; |
48 | u32 lower_threshold_valid_count; | 48 | u32 lower_threshold_valid_count; |
49 | u32 polling_interval; | 49 | u32 polling_interval; |