diff options
Diffstat (limited to 'drivers/staging/csr/unifi_pdu_processing.c')
-rw-r--r-- | drivers/staging/csr/unifi_pdu_processing.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index a762939a6ac..8f21d98dff2 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c | |||
@@ -1116,8 +1116,8 @@ void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,u16 interfaceTag, const CSR | |||
1116 | staRecord->nullDataHostTag = INVALID_HOST_TAG; | 1116 | staRecord->nullDataHostTag = INVALID_HOST_TAG; |
1117 | 1117 | ||
1118 | if(pkt_cfm->TransmissionStatus == CSR_TX_RETRY_LIMIT){ | 1118 | if(pkt_cfm->TransmissionStatus == CSR_TX_RETRY_LIMIT){ |
1119 | CsrTime now; | 1119 | u32 now; |
1120 | CsrTime inactive_time; | 1120 | u32 inactive_time; |
1121 | 1121 | ||
1122 | unifi_trace(priv, UDBG1, "Nulldata to probe STA ALIVE Failed with retry limit\n"); | 1122 | unifi_trace(priv, UDBG1, "Nulldata to probe STA ALIVE Failed with retry limit\n"); |
1123 | /* Recheck if there is some activity after null data is sent. | 1123 | /* Recheck if there is some activity after null data is sent. |
@@ -1133,12 +1133,12 @@ void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,u16 interfaceTag, const CSR | |||
1133 | if (staRecord->lastActivity > now) | 1133 | if (staRecord->lastActivity > now) |
1134 | { | 1134 | { |
1135 | /* simple timer wrap (for 1 wrap) */ | 1135 | /* simple timer wrap (for 1 wrap) */ |
1136 | inactive_time = CsrTimeAdd((CsrTime)CsrTimeSub(CSR_SCHED_TIME_MAX, staRecord->lastActivity), | 1136 | inactive_time = CsrTimeAdd((u32)CsrTimeSub(CSR_SCHED_TIME_MAX, staRecord->lastActivity), |
1137 | now); | 1137 | now); |
1138 | } | 1138 | } |
1139 | else | 1139 | else |
1140 | { | 1140 | { |
1141 | inactive_time = (CsrTime)CsrTimeSub(now, staRecord->lastActivity); | 1141 | inactive_time = (u32)CsrTimeSub(now, staRecord->lastActivity); |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | if (inactive_time >= STA_INACTIVE_TIMEOUT_VAL) | 1144 | if (inactive_time >= STA_INACTIVE_TIMEOUT_VAL) |
@@ -3491,11 +3491,11 @@ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_p | |||
3491 | } | 3491 | } |
3492 | 3492 | ||
3493 | /* Function to do inactivity */ | 3493 | /* Function to do inactivity */ |
3494 | void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, CsrTime currentTime) | 3494 | void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, u32 currentTime) |
3495 | { | 3495 | { |
3496 | u32 i; | 3496 | u32 i; |
3497 | CsrWifiRouterCtrlStaInfo_t *staInfo; | 3497 | CsrWifiRouterCtrlStaInfo_t *staInfo; |
3498 | CsrTime elapsedTime; /* Time in microseconds */ | 3498 | u32 elapsedTime; /* Time in microseconds */ |
3499 | netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; | 3499 | netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; |
3500 | CsrWifiMacAddress peerMacAddress; | 3500 | CsrWifiMacAddress peerMacAddress; |
3501 | unsigned long lock_flags; | 3501 | unsigned long lock_flags; |
@@ -3542,8 +3542,8 @@ void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, CsrTime currentTi | |||
3542 | /* Function to update activity of a station */ | 3542 | /* Function to update activity of a station */ |
3543 | void uf_update_sta_activity(unifi_priv_t *priv, u16 interfaceTag, const u8 *peerMacAddress) | 3543 | void uf_update_sta_activity(unifi_priv_t *priv, u16 interfaceTag, const u8 *peerMacAddress) |
3544 | { | 3544 | { |
3545 | CsrTime elapsedTime, currentTime; /* Time in microseconds */ | 3545 | u32 elapsedTime, currentTime; /* Time in microseconds */ |
3546 | CsrTime timeHi; /* Not used - Time in microseconds */ | 3546 | u32 timeHi; /* Not used - Time in microseconds */ |
3547 | CsrWifiRouterCtrlStaInfo_t *staInfo; | 3547 | CsrWifiRouterCtrlStaInfo_t *staInfo; |
3548 | netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; | 3548 | netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; |
3549 | unsigned long lock_flags; | 3549 | unsigned long lock_flags; |