diff options
| author | Florian Schilhabel <florian.c.schilhabel@googlemail.com> | 2010-07-15 21:04:36 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 23:00:22 +0400 |
| commit | 8388fd3605a31f15deb6ab5f64d5d0e311e9ce2d (patch) | |
| tree | 136450e518c6170c1e943e03899088d10fa2f7f2 | |
| parent | bb21199a013b13276336bb92012c9e68a0c179b9 (diff) | |
| download | linux-8388fd3605a31f15deb6ab5f64d5d0e311e9ce2d.tar.xz | |
staging: rtl8192su: merge changes into ieee80211_rx_ADDBARsp()
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c index 00539d6c41cf..ca611faf17bc 100644 --- a/drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c @@ -265,9 +265,6 @@ void ieee80211_send_ADDBAReq(struct ieee80211_device* ieee, u8* dst, PBA_RECORD if (skb) { 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 { @@ -291,7 +288,6 @@ void ieee80211_send_ADDBARsp(struct ieee80211_device* ieee, u8* dst, PBA_RECORD if (skb) { softmac_mgmt_xmit(skb, ieee); - //same above } else { @@ -318,7 +314,6 @@ void ieee80211_send_DELBA(struct ieee80211_device* ieee, u8* dst, PBA_RECORD pBA if (skb) { softmac_mgmt_xmit(skb, ieee); - //same above } else { @@ -414,7 +409,6 @@ int ieee80211_rx_ADDBAReq( struct ieee80211_device* ieee, struct sk_buff *skb) ActivateBAEntry(ieee, pBA, 0); ieee80211_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS); - // End of procedure. return 0; OnADDBAReq_Fail: @@ -546,11 +540,11 @@ int ieee80211_rx_ADDBARsp( struct ieee80211_device* ieee, struct sk_buff *skb) pAdmittedBA->BaParamSet = *pBaParamSet; DeActivateBAEntry(ieee, pAdmittedBA); ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal); - } - else - { - // Delay next ADDBA process. + } else { pTS->bAddBaReqDelayed = true; + pTS->bDisable_AddBa = true; + ReasonCode = DELBA_REASON_END_BA; + goto OnADDBARsp_Reject; } // End of procedure |