From 235d8f5befc25a3af5fb78ce7e7bd946539bcbfd Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 31 Aug 2010 10:15:26 -0500 Subject: [PATCH] --- yaml --- r: 219619 b: refs/heads/master c: 2e04fc838a1dc0afab7e788a90f39110d1cf922d h: refs/heads/master i: 219617: 0fc37bc95756325952e66e45fbdec625ef57ff05 219615: f0935e0b4e2a3997cf76d1b567e8fe2bc3829249 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8712/rtl871x_mlme.c | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index cb62bd74ca3c..74b562b84c2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d19b86473ec1c72fe657841c57ca8924f3df42f0 +refs/heads/master: 2e04fc838a1dc0afab7e788a90f39110d1cf922d diff --git a/trunk/drivers/staging/rtl8712/rtl871x_mlme.c b/trunk/drivers/staging/rtl8712/rtl871x_mlme.c index fb3508a012c9..98ba7602e250 100644 --- a/trunk/drivers/staging/rtl8712/rtl871x_mlme.c +++ b/trunk/drivers/staging/rtl8712/rtl871x_mlme.c @@ -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)