Return-path: Received: from mail-pg0-f68.google.com ([74.125.83.68]:34444 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbdAQW3U (ORCPT ); Tue, 17 Jan 2017 17:29:20 -0500 Received: by mail-pg0-f68.google.com with SMTP id t6so4895793pgt.1 for ; Tue, 17 Jan 2017 14:29:18 -0800 (PST) From: gavinli@thegavinli.com To: arend.vanspriel@broadcom.com, franky.lin@broadcom.com, hante.meuleman@broadcom.com, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com Cc: Gavin Li Subject: [PATCH] brcmfmac: fix incorrect event channel deduction Date: Tue, 17 Jan 2017 14:29:09 -0800 Message-Id: <20170117222909.2880-1-gavinli@thegavinli.com> (sfid-20170117_232924_275305_575DD926) Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Gavin Li brcmf_sdio_fromevntchan() was being called on the the hardware header rather than the software header, causing some frames to be mischaracterized as on the event channel rather than the data channel. This fixes the performance regression introduced in commit c56caa9d where event processing is done separately. Signed-off-by: Gavin Li --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index dfb0658713d9..d2219885071f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -1661,7 +1661,7 @@ static u8 brcmf_sdio_rxglom(struct brcmf_sdio *bus, u8 rxseq) pfirst->len, pfirst->next, pfirst->prev); skb_unlink(pfirst, &bus->glom); - if (brcmf_sdio_fromevntchan(pfirst->data)) + if (brcmf_sdio_fromevntchan(&dptr[SDPCM_HWHDR_LEN])) brcmf_rx_event(bus->sdiodev->dev, pfirst); else brcmf_rx_frame(bus->sdiodev->dev, pfirst, -- 2.11.0