|
@@ -25,7 +25,7 @@ static void TsInactTimeout(struct timer_list *unused)
|
|
********************************************************************************************************************/
|
|
********************************************************************************************************************/
|
|
static void RxPktPendingTimeout(struct timer_list *t)
|
|
static void RxPktPendingTimeout(struct timer_list *t)
|
|
{
|
|
{
|
|
- struct rx_ts_record *pRxTs = from_timer(pRxTs, t, RxPktPendingTimer);
|
|
|
|
|
|
+ struct rx_ts_record *pRxTs = from_timer(pRxTs, t, rx_pkt_pending_timer);
|
|
struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);
|
|
struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);
|
|
|
|
|
|
PRX_REORDER_ENTRY pReorderEntry = NULL;
|
|
PRX_REORDER_ENTRY pReorderEntry = NULL;
|
|
@@ -78,7 +78,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
|
|
|
|
|
|
if(bPktInBuf && (pRxTs->rx_timeout_indicate_seq == 0xffff)) {
|
|
if(bPktInBuf && (pRxTs->rx_timeout_indicate_seq == 0xffff)) {
|
|
pRxTs->rx_timeout_indicate_seq = pRxTs->rx_indicate_seq;
|
|
pRxTs->rx_timeout_indicate_seq = pRxTs->rx_indicate_seq;
|
|
- mod_timer(&pRxTs->RxPktPendingTimer,
|
|
|
|
|
|
+ mod_timer(&pRxTs->rx_pkt_pending_timer,
|
|
jiffies + msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime));
|
|
jiffies + msecs_to_jiffies(ieee->pHTInfo->RxReorderPendingTime));
|
|
}
|
|
}
|
|
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
|
|
spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
|
|
@@ -173,7 +173,7 @@ void TSInitialize(struct ieee80211_device *ieee)
|
|
0);
|
|
0);
|
|
timer_setup(&pRxTS->RxAdmittedBARecord.Timer,
|
|
timer_setup(&pRxTS->RxAdmittedBARecord.Timer,
|
|
RxBaInactTimeout, 0);
|
|
RxBaInactTimeout, 0);
|
|
- timer_setup(&pRxTS->RxPktPendingTimer, RxPktPendingTimeout, 0);
|
|
|
|
|
|
+ timer_setup(&pRxTS->rx_pkt_pending_timer, RxPktPendingTimeout, 0);
|
|
ResetRxTsEntry(pRxTS);
|
|
ResetRxTsEntry(pRxTS);
|
|
list_add_tail(&pRxTS->ts_common_info.list, &ieee->Rx_TS_Unused_List);
|
|
list_add_tail(&pRxTS->ts_common_info.list, &ieee->Rx_TS_Unused_List);
|
|
pRxTS++;
|
|
pRxTS++;
|
|
@@ -420,8 +420,8 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *
|
|
//#ifdef TO_DO_LIST
|
|
//#ifdef TO_DO_LIST
|
|
PRX_REORDER_ENTRY pRxReorderEntry;
|
|
PRX_REORDER_ENTRY pRxReorderEntry;
|
|
struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs;
|
|
struct rx_ts_record *pRxTS = (struct rx_ts_record *)pTs;
|
|
- if(timer_pending(&pRxTS->RxPktPendingTimer))
|
|
|
|
- del_timer_sync(&pRxTS->RxPktPendingTimer);
|
|
|
|
|
|
+ if(timer_pending(&pRxTS->rx_pkt_pending_timer))
|
|
|
|
+ del_timer_sync(&pRxTS->rx_pkt_pending_timer);
|
|
|
|
|
|
while(!list_empty(&pRxTS->rx_pending_pkt_list)) {
|
|
while(!list_empty(&pRxTS->rx_pending_pkt_list)) {
|
|
spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
|
|
spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
|