From: Larry Finger <Larry.Finger@lwfinger.net>
To: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: "Rafał Miłecki" <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>
Subject: Re: [PATCH] b43: fix regression in PIO case
Date: Tue, 27 Dec 2011 17:47:09 -0600 [thread overview]
Message-ID: <4EFA58FD.9060605@lwfinger.net> (raw)
In-Reply-To: <alpine.DEB.2.00.1112272359240.6684@axis700.grange>
On 12/27/2011 05:05 PM, Guennadi Liakhovetski wrote:
> On Tue, 27 Dec 2011, Rafał Miłecki wrote:
>
>> W dniu 26 grudnia 2011 18:28 użytkownik Guennadi Liakhovetski
>> <g.liakhovetski@gmx.de> napisał:
>>> 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;
>>> + }
>>> + memset(rxhdr, 0, rxhdr_size);
>>
>> Huuh, that's really tricky. Can you just do "normal" conditions as
>> Larry suggested, please?
>
> Sorry? I absolutely see nothing tricky there. Do you think this would look
> "less tricky" to you:
>
> switch (dev->fw.hdr_format) {
> case B43_FW_HDR_410:
> case B43_FW_HDR_351:
> rxhdr_size = offsetof(struct b43_rxhdr_fw4,
> format_351) +
> sizeof(rxhdr_size->format_351);
> break;
> case B43_FW_HDR_598:
> rxhdr_size = sizeof(*rxhdr);
> break;
> }
>
How about this?
Index: wireless-testing-new/drivers/net/wireless/b43/pio.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/b43/pio.c
+++ wireless-testing-new/drivers/net/wireless/b43/pio.c
@@ -617,9 +617,20 @@ static bool pio_rx_frame(struct b43_pio_
const char *err_msg = NULL;
struct b43_rxhdr_fw4 *rxhdr =
(struct b43_rxhdr_fw4 *)wl->pio_scratchspace;
+ size_t rxhdr_size;
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_351);
+ break;
+ case B43_FW_HDR_598:
+ default:
+ rxhdr_size = sizeof(rxhdr->format_598);
+ break;
+ }
+ memset(rxhdr, 0, rxhdr_size);
/* Check if we have data and wait for it to get ready. */
if (q->rev >= 8) {
Larry
next prev parent reply other threads:[~2011-12-27 23:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-26 15:29 [PATCH] b43: support new RX header, noticed to be used in 598.314+ fw Guennadi Liakhovetski
2011-12-26 17:18 ` Larry Finger
2011-12-26 17:28 ` [PATCH] b43: fix regression in PIO case Guennadi Liakhovetski
2011-12-26 17:51 ` Larry Finger
2011-12-26 18:17 ` Guennadi Liakhovetski
2011-12-26 18:32 ` Larry Finger
2011-12-27 18:47 ` Rafał Miłecki
2011-12-27 23:05 ` Guennadi Liakhovetski
2011-12-27 23:47 ` Larry Finger [this message]
2011-12-28 0:00 ` Guennadi Liakhovetski
2011-12-28 0:11 ` Larry Finger
2011-12-28 16:37 ` Guennadi Liakhovetski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EFA58FD.9060605@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=g.liakhovetski@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=torvalds@linux-foundation.org \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).