From patchwork Tue Jan 17 22:29:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Li X-Patchwork-Id: 9522011 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D655260244 for ; Tue, 17 Jan 2017 22:29:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C008F2861F for ; Tue, 17 Jan 2017 22:29:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4F3228621; Tue, 17 Jan 2017 22:29:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 503A72861F for ; Tue, 17 Jan 2017 22:29:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750992AbdAQW3V (ORCPT ); Tue, 17 Jan 2017 17:29:21 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thegavinli.com; s=google; h=sender:from:to:cc:subject:date:message-id; bh=Dgw5bci8dzc9W1WDg7WnCdl12JRfb4kmaITYF4xw3r8=; b=UqJs931nWL8/AOwgEmNRIvYYo6RflAHyghqPHMx+d87XdolRbvP2xBcB4/P7sXZYTb H2NZIPxHb4n20SDqf44qZbPKOq19qX5d9Ib0Sr090L7Tq/W4RygVr2xe0bEQGcN1YsDd Bmmr8HBfXg7KmVOJrbGEalNJz62l4lxWdFQjQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=Dgw5bci8dzc9W1WDg7WnCdl12JRfb4kmaITYF4xw3r8=; b=izHC2gxqq7wq3Y1uk1xllO9ffCs6FcMLpt9L7tJIbpmEyx8pU/96XKWIM0UyCkq47y VmoDWQAsP3c0QDKRhBxW2pf1x0+7pNmIeMT4UjmbC2FzhfW5bq3BrpZePrywsY3/WABB FKGvLQ/+9g1+yezlswn1Ql+tkcPs3Lx6MciIkA6fFfwpNThixUZwhWsd7dFo/v4VYM8i nv3WtEqB8pQrvSxhgKqxhiZ1Z6hWagSu9NasDtOkzXgJlV7rZ+i0YuvvuuiL6lwRM1cV R56QPSaKAX4Mw/Y1EBxIqyTZmuURsjonyrCjVikRWj3TRErM8/UvFnlI7JBhGuMCOl0R p7LQ== X-Gm-Message-State: AIkVDXKKDwoR/shIxQwFfUQ8vtOgmxuynPGoCEiO7qGSSjQD1GHawy1PWdbsJ0lgbOWEiA== X-Received: by 10.99.173.14 with SMTP id g14mr18344082pgf.176.1484692157910; Tue, 17 Jan 2017 14:29:17 -0800 (PST) Received: from localhost.localdomain ([2601:645:c000:efa:caf7:33ff:feb9:3269]) by smtp.gmail.com with ESMTPSA id k184sm3521245pgc.23.2017.01.17.14.29.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jan 2017 14:29:17 -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> X-Mailer: git-send-email 2.11.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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,