diff options
| author | Nicolas Cavallari <Nicolas.Cavallari@lri.fr> | 2012-02-23 16:53:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 10:33:01 -0700 |
| commit | 2070216144d9c8ff4894a443b093277b42342b12 (patch) | |
| tree | 2fc1c1bb103dc7f87513b7f971f4bfe68f80e9cc | |
| parent | 412821717f792e86941e16f507637b2b5592aa81 (diff) | |
| download | kernel_samsung_smdk4412-2070216144d9c8ff4894a443b093277b42342b12.zip kernel_samsung_smdk4412-2070216144d9c8ff4894a443b093277b42342b12.tar.gz kernel_samsung_smdk4412-2070216144d9c8ff4894a443b093277b42342b12.tar.bz2 | |
carl9170: Fix memory accounting when sta is in power-save mode.
commit 992d52529d7840236d3059b51c15d5eb9e81a869 upstream.
On Access Point mode, when transmitting a packet, if the destination
station is in powersave mode, we abort transmitting the packet to the
device queue, but we do not reclaim the allocated memory. Given enough
packets, we can go in a state where there is no packet on the device
queue, but we think the device has no memory left, so no packet gets
transmitted, connections breaks and the AP stops working.
This undo the allocation done in the TX path when the station is in
power-save mode.
Signed-off-by: Nicolas Cavallari <cavallar@lri.fr>
Acked-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/tx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c index e94084f..f190f32 100644 --- a/drivers/net/wireless/ath/carl9170/tx.c +++ b/drivers/net/wireless/ath/carl9170/tx.c @@ -1245,6 +1245,7 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb) atomic_dec(&ar->tx_ampdu_upload); tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED; + carl9170_release_dev_space(ar, skb); carl9170_tx_status(ar, skb, false); return true; } |