From patchwork Fri Sep 23 13:27:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9348103 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 5219C601C2 for ; Fri, 23 Sep 2016 13:28:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4386D2A9B7 for ; Fri, 23 Sep 2016 13:28:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37FC12AAD9; Fri, 23 Sep 2016 13:28:43 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 111F12A9B7 for ; Fri, 23 Sep 2016 13:28:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033992AbcIWN2g (ORCPT ); Fri, 23 Sep 2016 09:28:36 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35740 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965106AbcIWN2d (ORCPT ); Fri, 23 Sep 2016 09:28:33 -0400 Received: by mail-lf0-f68.google.com with SMTP id s64so5713092lfs.2; Fri, 23 Sep 2016 06:28:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=n2L+6RJ8tc3hs/ViwXOidiaKN16ACaq1EVTvxDZEQzY=; b=apq+sZWICZrRZ16aEsK83ZBCL2DRW1fzrPYVEzX7GYFSiyRJtruqdX9JwJH25cQ0U+ MJGcvPLOS6k039y90YKxuQKtdRnJlGwc2/7mzrmW01r/YfVMKPZyRXRIlBv5xlndte+M wJBG4ui8txofRtggjkiMfbm4HqpOaSX95F7iYbHvDXmeZOYvlY6LSHcEOlfPloNKdgu3 y6jw0xIas+qk1LbqhIta3uncOjdMgaqcIrP9EezaY9+BwdLB4KAWohNge180PXJSqonE ex6kpIQIUa+iZ3Xlg1If+4HLJUBGpyvUHjnCqaJu7+SBDRSO7vgQXTTUa+2gyaJgFXdx /2bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=n2L+6RJ8tc3hs/ViwXOidiaKN16ACaq1EVTvxDZEQzY=; b=jRJ8Vk6ijn+qen/f3PnohEKXc3FwSIFF/OSxHuZ05DcxSKkVNlnTVQmRdDt2F1gFn8 hhf+kxv9pMXnyWIbgDRU4AdN1FxLBaOUy4+cpruwVSUc8J5tlVH6oC3K4dPT0gp7M48Q yR/oNjV+TeF2CvoUrw5IfY1uXPVEHHLtUlYQORCJPeLA4iu7I+FIseaUftufve33eReH cqmu9l9lNUHhhvFyoD1xl/db4Ax1pXMxmvPnrr03bZWk5SXPh3KgofsOqFgPQwNJTIMw u17Xs3vaJxWqQb5uERNfLkOH9/H7z+M+aHainTJPs9j5GCIrTZkpNfLzvijBOPWzIPBi Z5yA== X-Gm-Message-State: AE9vXwP/rRdNYHtiGdXnik9huhUDo3WXWu7qYYCpzCS1ceYRwYIU1gEjB9YrFgRMlJMPmQ== X-Received: by 10.25.209.204 with SMTP id i195mr3057056lfg.20.1474637311230; Fri, 23 Sep 2016 06:28:31 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id f71sm1197722lfg.36.2016.09.23.06.28.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Sep 2016 06:28:30 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Arend van Spriel , Franky Lin , Hante Meuleman , Pieter-Paul Giesberts , "Franky (Zhenhui) Lin" , Colin Ian King , linux-wireless@vger.kernel.org (open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER), brcm80211-dev-list.pdl@broadcom.com (open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] brcmfmac: drop unused fields from struct brcmf_pub Date: Fri, 23 Sep 2016 15:27:46 +0200 Message-Id: <20160923132759.21875-1-zajec5@gmail.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.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: Rafał Miłecki They seem to be there from the first day. We calculate these values but never use them. Signed-off-by: Rafał Miłecki --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 3 --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h | 4 ---- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 2 -- 3 files changed, 9 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index 65e8c87..27cd50a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -519,9 +519,6 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked) ndev->needed_headroom += drvr->hdrlen; ndev->ethtool_ops = &brcmf_ethtool_ops; - drvr->rxsz = ndev->mtu + ndev->hard_header_len + - drvr->hdrlen; - /* set the mac address */ memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h index 8fa34ca..f16cfc9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h @@ -112,15 +112,11 @@ struct brcmf_pub { /* Internal brcmf items */ uint hdrlen; /* Total BRCMF header length (proto + bus) */ - uint rxsz; /* Rx buffer size bus module should use */ /* Dongle media info */ char fwver[BRCMF_DRIVER_FIRMWARE_VERSION_LEN]; u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */ - /* Multicast data packets sent to dongle */ - unsigned long tx_multicast; - struct mac_address addresses[BRCMF_MAX_IFS]; struct brcmf_if *iflist[BRCMF_MAX_IFS]; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c index 9f9024a..a190f53 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c @@ -2104,8 +2104,6 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb) if ((skb->priority == 0) || (skb->priority > 7)) skb->priority = cfg80211_classify8021d(skb, NULL); - drvr->tx_multicast += !!multicast; - if (fws->avoid_queueing) { rc = brcmf_proto_txdata(drvr, ifp->ifidx, 0, skb); if (rc < 0)