On Tue, 2011-08-09 at 12:13 +0300, Eliad Peller wrote:
> From: Arik Nemtsov <arik@xxxxxxxxxx>
>
> Remove support for firmwares that require 2 spare blocks for packet TX.
>
> Signed-off-by: Arik Nemtsov <arik@xxxxxxxxxx>
> Signed-off-by: Eliad Peller <eliad@xxxxxxxxxx>
> ---
> drivers/net/wireless/wl12xx/tx.c | 7 ++-----
> 1 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
> index 0696aed..c67340f 100644
> --- a/drivers/net/wireless/wl12xx/tx.c
> +++ b/drivers/net/wireless/wl12xx/tx.c
> @@ -166,18 +166,15 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,
> {
> struct wl1271_tx_hw_descr *desc;
> u32 total_len = skb->len + sizeof(struct wl1271_tx_hw_descr) + extra;
> u32 len;
> u32 total_blocks;
> int id, ret = -EBUSY;
> - u32 spare_blocks;
>
> - if (unlikely(wl->quirks & WL12XX_QUIRK_USE_2_SPARE_BLOCKS))
> - spare_blocks = 2;
> - else
> - spare_blocks = 1;
> + /* we use 1 spare block */
> + u32 spare_blocks = 1;
>
> if (buf_offset + total_len > WL1271_AGGR_BUFFER_SIZE)
> return -EAGAIN;
>
> /* allocate free identifier for the packet */
> id = wl1271_alloc_tx_id(wl, skb);
Please, remove the quirk completely as it is not used anymore after this
patch.
--
Cheers,
Luca.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
