Return-path: Received: from mail-ww0-f44.google.com ([74.125.82.44]:36473 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750972Ab1L0SrH convert rfc822-to-8bit (ORCPT ); Tue, 27 Dec 2011 13:47:07 -0500 MIME-Version: 1.0 In-Reply-To: References: Date: Tue, 27 Dec 2011 19:47:06 +0100 Message-ID: (sfid-20111227_194713_435731_FB096E98) Subject: Re: [PATCH] b43: fix regression in PIO case From: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= To: Guennadi Liakhovetski Cc: linux-wireless@vger.kernel.org, "John W. Linville" , linux-kernel@vger.kernel.org, Linus Torvalds Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: W dniu 26 grudnia 2011 18:28 użytkownik Guennadi Liakhovetski napisał: > This patch fixes the regression, introduced by > > commit 17030f48e31adde5b043741c91ba143f5f7db0fd > From: Rafał Miłecki > 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 > --- > 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? -- Rafał