Message-ID: <4EF8BDAF.6050402@lwfinger.net> (sfid-20111226_193224_796258_119FE9C2)
Date: Mon, 26 Dec 2011 12:32:15 -0600
From: Larry Finger <Larry.Finger@lwfinger.net>
MIME-Version: 1.0
To: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
CC: =?ISO-8859-2?Q?Rafa=B3_Mi=B3ecki?= <zajec5@gmail.com>,
	linux-wireless@vger.kernel.org,
	"John W. Linville" <linville@tuxdriver.com>,
	linux-kernel@vger.kernel.org,
	Linus Torvalds <torvalds@linux-foundation.org>,
	b43-dev <b43-dev@lists.infradead.org>
Subject: Re: [PATCH] b43: fix regression in PIO case
References: <alpine.DEB.2.00.1112261608140.12108@axis700.grange> <alpine.DEB.2.00.1112261824000.12108@axis700.grange> <4EF8B42C.2020402@lwfinger.net> <alpine.DEB.2.00.1112261909550.12108@axis700.grange>
In-Reply-To: <alpine.DEB.2.00.1112261909550.12108@axis700.grange>
Content-Type: text/plain; charset=ISO-8859-2; format=flowed
Sender: linux-wireless-owner@vger.kernel.org

On 12/26/2011 12:17 PM, Guennadi Liakhovetski wrote:
> On Mon, 26 Dec 2011, Larry Finger wrote:
>
>> On 12/26/2011 11:28 AM, Guennadi Liakhovetski wrote:
>>> This patch fixes the regression, introduced by
>>>
>>> commit 17030f48e31adde5b043741c91ba143f5f7db0fd
>>> From: Rafa? Mi?ecki<zajec5@gmail.com>
>>> Date: Thu, 11 Aug 2011 17:16:27 +0200
>>> Subject: [PATCH] b43: support new RX header, noticed to be used in 598.314+
>>> fw
>>>
>>> in PIO case.
>>>
>>> Signed-off-by: Guennadi Liakhovetski<g.liakhovetski@gmx.de>
>>> ---
>>> diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c
>>> index ce8a4bd..b64b64c 100644
>>> --- a/drivers/net/wireless/b43/pio.c
>>> +++ b/drivers/net/wireless/b43/pio.c
>>> @@ -617,9 +617,19 @@ static bool pio_rx_frame(struct b43_pio_rxqueue *q)
>>>    	const char *err_msg = NULL;
>>>    	struct b43_rxhdr_fw4 *rxhdr =
>>>    		(struct b43_rxhdr_fw4 *)wl->pio_scratchspace;
>>> +	size_t rxhdr_size = sizeof(*rxhdr);
>>>
>>>    	BUILD_BUG_ON(sizeof(wl->pio_scratchspace)<   sizeof(*rxhdr));
>>> -	memset(rxhdr, 0, sizeof(*rxhdr));
>>> +	switch (dev->fw.hdr_format) {
>>> +	case B43_FW_HDR_410:
>>> +	case B43_FW_HDR_351:
>>> +		rxhdr_size -= sizeof(rxhdr->format_598) -
>>> +			sizeof(rxhdr->format_351);
>>> +		break;
>>> +	case B43_FW_HDR_598:
>>> +		break;
>>> +	}
>>
>> I do not think the above will work for format_410. By my count, the format_410
>> struct is 4 bytes longer than the format_351 struct.
>
> I think you're looking at struct b43_txhdr, whereas the problem is in
> struct b43_rxhdr_fw4.
>
> Thanks
> Guennadi
>
>>
>> Even if it does work, I suggest using the following:
>>
>> 	size_t rxhdr_size;
>>
>>     	BUILD_BUG_ON(sizeof(wl->pio_scratchspace)<   sizeof(*rxhdr));
>> 	switch (dev->fw.hdr_format) {
>> 	case B43_FW_HDR_351:
>> 		rxhdr_size = sizeof(rxhdr->format_351);
>> 		break;
>> 	case B43_FW_HDR_410:

You are correct - I was looking in the wrong place. Even so, I prefer setting 
rxhdr_size in the case branches, and not adjust one preset earlier.

Larry