From ffed8add7ce164bac32800032cf59667dfdc8846 Mon Sep 17 00:00:00 2001 From: Juuso Oikarinen Date: Thu, 8 Oct 2009 21:56:18 +0300 Subject: [PATCH] --- yaml --- r: 170903 b: refs/heads/master c: 3b4be9e08abd8c390d13001f5dd55f64afa5ab93 h: refs/heads/master i: 170901: 6a9e4e317b2e6cb2d2974650f4ce908f2b93f794 170899: eaeccafe08c081f96afcb6e7dce12f7f70d01c6b 170895: 81018a594bc9c26c54e4fa60702f9fe232026b94 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 94649515f757..7569d78c96ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d565973deb09479de5eed7a5b6594428dc49dde +refs/heads/master: 3b4be9e08abd8c390d13001f5dd55f64afa5ab93 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c b/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c index ff221258b941..0c19688f4405 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c +++ b/trunk/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) /* approximate the number of blocks required for this packet in the firmware */ /* FIXME: try to figure out what is done here and make it cleaner */ - total_blocks = (skb->len) >> TX_HW_BLOCK_SHIFT_DIV; + total_blocks = (total_len) >> TX_HW_BLOCK_SHIFT_DIV; excluded = (total_blocks << 2) + (skb->len & 0xff) + 34; total_blocks += (excluded > 252) ? 2 : 1; total_blocks += TX_HW_BLOCK_SPARE;