Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219619
b: refs/heads/master
c: 2e04fc8
h: refs/heads/master
i:
  219617: 0fc37bc
  219615: f0935e0
v: v3
  • Loading branch information
Larry Finger authored and Greg Kroah-Hartman committed Aug 31, 2010
1 parent bad7e68 commit 235d8f5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d19b86473ec1c72fe657841c57ca8924f3df42f0
refs/heads/master: 2e04fc838a1dc0afab7e788a90f39110d1cf922d
18 changes: 8 additions & 10 deletions trunk/drivers/staging/rtl8712/rtl871x_mlme.c
Original file line number Diff line number Diff line change
Expand Up @@ -1036,21 +1036,19 @@ void r8712_got_addbareq_event_callback(struct _adapter *adapter, u8 *pbuf)
struct sta_info *psta;
struct sta_priv *pstapriv = &adapter->stapriv;
struct recv_reorder_ctrl *precvreorder_ctrl = NULL;
struct __queue *ppending_recvframe_queue = NULL;
unsigned long irql;

printk(KERN_INFO "r8712u: [%s] mac = %pM, seq = %d, tid = %d\n",
__func__, pAddbareq_pram->MacAddress,
pAddbareq_pram->StartSeqNum, pAddbareq_pram->tid);
psta = r8712_get_stainfo(pstapriv, pAddbareq_pram->MacAddress);
precvreorder_ctrl = &psta->recvreorder_ctrl[pAddbareq_pram->tid];
ppending_recvframe_queue = &precvreorder_ctrl->pending_recvframe_queue;
spin_lock_irqsave(&ppending_recvframe_queue->lock, irql);
r8712_recv_indicatepkts_in_order(adapter, precvreorder_ctrl, true);
spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
/* set the indicate_seq to 0xffff so that the rx reorder can store
* any following data packet.*/
precvreorder_ctrl->indicate_seq = 0xffff;
if (psta) {
precvreorder_ctrl =
&psta->recvreorder_ctrl[pAddbareq_pram->tid];
/* set the indicate_seq to 0xffff so that the rx reorder
* can store any following data packet.
*/
precvreorder_ctrl->indicate_seq = 0xffff;
}
}

void r8712_wpspbc_event_callback(struct _adapter *adapter, u8 *pbuf)
Expand Down

0 comments on commit 235d8f5

Please sign in to comment.