diff options
author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2009-10-08 14:56:18 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:47:48 -0400 |
commit | 3b4be9e08abd8c390d13001f5dd55f64afa5ab93 (patch) | |
tree | 10bd9397fb01190d17dc235a1b71d8f325b60973 /drivers/net/wireless | |
parent | 9d565973deb09479de5eed7a5b6594428dc49dde (diff) |
wl1271: Correction to TX block allocation calculation
Correct the TX path implementation to allocate sufficient blocks in the
firmware for TX packets.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c index ff221258b941..0c19688f4405 100644 --- a/drivers/net/wireless/wl12xx/wl1271_tx.c +++ b/drivers/net/wireless/wl12xx/wl1271_tx.c | |||
@@ -58,7 +58,7 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra) | |||
58 | /* approximate the number of blocks required for this packet | 58 | /* approximate the number of blocks required for this packet |
59 | in the firmware */ | 59 | in the firmware */ |
60 | /* FIXME: try to figure out what is done here and make it cleaner */ | 60 | /* FIXME: try to figure out what is done here and make it cleaner */ |
61 | total_blocks = (skb->len) >> TX_HW_BLOCK_SHIFT_DIV; | 61 | total_blocks = (total_len) >> TX_HW_BLOCK_SHIFT_DIV; |
62 | excluded = (total_blocks << 2) + (skb->len & 0xff) + 34; | 62 | excluded = (total_blocks << 2) + (skb->len & 0xff) + 34; |
63 | total_blocks += (excluded > 252) ? 2 : 1; | 63 | total_blocks += (excluded > 252) ? 2 : 1; |
64 | total_blocks += TX_HW_BLOCK_SPARE; | 64 | total_blocks += TX_HW_BLOCK_SPARE; |