lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192su: merge changes into ieee80211_rx_ADDBARsp()

Browse Source 
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Florian Schilhabel
2010-07-15 19:04:36 +02:00
committed by Greg Kroah-Hartman
parent bb21199a01
commit 8388fd3605
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c
View File

@@ -265,9 +265,6 @@ void ieee80211_send_ADDBAReq(struct ieee80211_device* ieee, u8* dst, PBA_RECORD
if (skb) if (skb)
{ {
softmac_mgmt_xmit(skb, ieee); softmac_mgmt_xmit(skb, ieee);
//add statistic needed here.
//and skb will be freed in softmac_mgmt_xmit(), so omit all dev_kfree_skb_any() outside softmac_mgmt_xmit()
//WB
} }
else else
{ {
@@ -291,7 +288,6 @@ void ieee80211_send_ADDBARsp(struct ieee80211_device* ieee, u8* dst, PBA_RECORD
if (skb) if (skb)
{ {
softmac_mgmt_xmit(skb, ieee); softmac_mgmt_xmit(skb, ieee);
//same above
} }
else else
{ {
@@ -318,7 +314,6 @@ void ieee80211_send_DELBA(struct ieee80211_device* ieee, u8* dst, PBA_RECORD pBA
if (skb) if (skb)
{ {
softmac_mgmt_xmit(skb, ieee); softmac_mgmt_xmit(skb, ieee);
//same above
} }
else else
{ {
@@ -414,7 +409,6 @@ int ieee80211_rx_ADDBAReq( struct ieee80211_device* ieee, struct sk_buff *skb)
ActivateBAEntry(ieee, pBA, 0); ActivateBAEntry(ieee, pBA, 0);
ieee80211_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS); ieee80211_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS);
// End of procedure.
return 0; return 0;
OnADDBAReq_Fail: OnADDBAReq_Fail:
@@ -546,11 +540,11 @@ int ieee80211_rx_ADDBARsp( struct ieee80211_device* ieee, struct sk_buff *skb)
pAdmittedBA->BaParamSet = *pBaParamSet; pAdmittedBA->BaParamSet = *pBaParamSet;
DeActivateBAEntry(ieee, pAdmittedBA); DeActivateBAEntry(ieee, pAdmittedBA);
ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal); ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal);
} } else {
else
{
// Delay next ADDBA process.
pTS->bAddBaReqDelayed = true; pTS->bAddBaReqDelayed = true;
pTS->bDisable_AddBa = true;
ReasonCode = DELBA_REASON_END_BA;
goto OnADDBARsp_Reject;
} }
// End of procedure // End of procedure