aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2016-09-23 09:27:46 -0400
committerKalle Valo <kvalo@codeaurora.org>2016-09-26 13:51:02 -0400
commit2df86ad959c9d1cdbeb2f23a0801857731156692 (patch)
tree058f144fcc3bf18b611aadbbedb5c70ee4161c46 /drivers/net
parent23e9c128adb2038c27a424a5f91136e7fa3e0dc6 (diff)
brcmfmac: drop unused fields from struct brcmf_pub
They seem to be there from the first day. We calculate these values but never use them. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c3
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h4
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c2
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 7a65f9da048a..17152805d96f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -508,9 +508,6 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)
508 ndev->needed_headroom += drvr->hdrlen; 508 ndev->needed_headroom += drvr->hdrlen;
509 ndev->ethtool_ops = &brcmf_ethtool_ops; 509 ndev->ethtool_ops = &brcmf_ethtool_ops;
510 510
511 drvr->rxsz = ndev->mtu + ndev->hard_header_len +
512 drvr->hdrlen;
513
514 /* set the mac address */ 511 /* set the mac address */
515 memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN); 512 memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
516 513
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
index 8a810bb24a11..c94dcab260d0 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 {
112 112
113 /* Internal brcmf items */ 113 /* Internal brcmf items */
114 uint hdrlen; /* Total BRCMF header length (proto + bus) */ 114 uint hdrlen; /* Total BRCMF header length (proto + bus) */
115 uint rxsz; /* Rx buffer size bus module should use */
116 115
117 /* Dongle media info */ 116 /* Dongle media info */
118 char fwver[BRCMF_DRIVER_FIRMWARE_VERSION_LEN]; 117 char fwver[BRCMF_DRIVER_FIRMWARE_VERSION_LEN];
119 u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */ 118 u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */
120 119
121 /* Multicast data packets sent to dongle */
122 unsigned long tx_multicast;
123
124 struct mac_address addresses[BRCMF_MAX_IFS]; 120 struct mac_address addresses[BRCMF_MAX_IFS];
125 121
126 struct brcmf_if *iflist[BRCMF_MAX_IFS]; 122 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 9f9024a7bd64..a190f535efc9 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)
2104 if ((skb->priority == 0) || (skb->priority > 7)) 2104 if ((skb->priority == 0) || (skb->priority > 7))
2105 skb->priority = cfg80211_classify8021d(skb, NULL); 2105 skb->priority = cfg80211_classify8021d(skb, NULL);
2106 2106
2107 drvr->tx_multicast += !!multicast;
2108
2109 if (fws->avoid_queueing) { 2107 if (fws->avoid_queueing) {
2110 rc = brcmf_proto_txdata(drvr, ifp->ifidx, 0, skb); 2108 rc = brcmf_proto_txdata(drvr, ifp->ifidx, 0, skb);
2111 if (rc < 0) 2109 if (rc < 0)