|
@@ -39,8 +39,8 @@ static void RxPktPendingTimeout(struct timer_list *t)
|
|
IEEE80211_DEBUG(IEEE80211_DL_REORDER,"==================>%s()\n",__func__);
|
|
IEEE80211_DEBUG(IEEE80211_DL_REORDER,"==================>%s()\n",__func__);
|
|
if(pRxTs->rx_timeout_indicate_seq != 0xffff) {
|
|
if(pRxTs->rx_timeout_indicate_seq != 0xffff) {
|
|
// Indicate the pending packets sequentially according to SeqNum until meet the gap.
|
|
// Indicate the pending packets sequentially according to SeqNum until meet the gap.
|
|
- while(!list_empty(&pRxTs->RxPendingPktList)) {
|
|
|
|
- pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTs->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
|
|
|
|
|
|
+ while(!list_empty(&pRxTs->rx_pending_pkt_list)) {
|
|
|
|
+ pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTs->rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List);
|
|
if(index == 0)
|
|
if(index == 0)
|
|
pRxTs->rx_indicate_seq = pReorderEntry->SeqNum;
|
|
pRxTs->rx_indicate_seq = pReorderEntry->SeqNum;
|
|
|
|
|
|
@@ -166,7 +166,7 @@ void TSInitialize(struct ieee80211_device *ieee)
|
|
INIT_LIST_HEAD(&ieee->Rx_TS_Unused_List);
|
|
INIT_LIST_HEAD(&ieee->Rx_TS_Unused_List);
|
|
for(count = 0; count < TOTAL_TS_NUM; count++) {
|
|
for(count = 0; count < TOTAL_TS_NUM; count++) {
|
|
pRxTS->num = count;
|
|
pRxTS->num = count;
|
|
- INIT_LIST_HEAD(&pRxTS->RxPendingPktList);
|
|
|
|
|
|
+ INIT_LIST_HEAD(&pRxTS->rx_pending_pkt_list);
|
|
timer_setup(&pRxTS->ts_common_info.setup_timer, TsSetupTimeOut,
|
|
timer_setup(&pRxTS->ts_common_info.setup_timer, TsSetupTimeOut,
|
|
0);
|
|
0);
|
|
timer_setup(&pRxTS->ts_common_info.inact_timer, TsInactTimeout,
|
|
timer_setup(&pRxTS->ts_common_info.inact_timer, TsInactTimeout,
|
|
@@ -423,10 +423,10 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *
|
|
if(timer_pending(&pRxTS->RxPktPendingTimer))
|
|
if(timer_pending(&pRxTS->RxPktPendingTimer))
|
|
del_timer_sync(&pRxTS->RxPktPendingTimer);
|
|
del_timer_sync(&pRxTS->RxPktPendingTimer);
|
|
|
|
|
|
- while(!list_empty(&pRxTS->RxPendingPktList)) {
|
|
|
|
|
|
+ while(!list_empty(&pRxTS->rx_pending_pkt_list)) {
|
|
spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
|
|
spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
|
|
- //pRxReorderEntry = list_entry(&pRxTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
|
|
|
|
- pRxReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List);
|
|
|
|
|
|
+ //pRxReorderEntry = list_entry(&pRxTS->rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List);
|
|
|
|
+ pRxReorderEntry = (PRX_REORDER_ENTRY)list_entry(pRxTS->rx_pending_pkt_list.prev,RX_REORDER_ENTRY,List);
|
|
list_del_init(&pRxReorderEntry->List);
|
|
list_del_init(&pRxReorderEntry->List);
|
|
{
|
|
{
|
|
int i = 0;
|
|
int i = 0;
|