diff options
Diffstat (limited to 'drivers/staging/ath6kl/os/linux/ar6000_drv.c')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 24 |
1 files changed, 11 insertions, 13 deletions
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 | { |