mac80211: backport brcmfmac changes from 2016-09-26
[openwrt/staging/yousong.git] / package / kernel / mac80211 / patches / 319-0030-brcmfmac-drop-unused-fields-from-struct-brcmf_pub.patch
1 From 2df86ad959c9d1cdbeb2f23a0801857731156692 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Fri, 23 Sep 2016 15:27:46 +0200
4 Subject: [PATCH] brcmfmac: drop unused fields from struct brcmf_pub
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 They seem to be there from the first day. We calculate these values but
10 never use them.
11
12 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
14 ---
15 drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 3 ---
16 drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h | 4 ----
17 drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 2 --
18 3 files changed, 9 deletions(-)
19
20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
22 @@ -508,9 +508,6 @@ int brcmf_net_attach(struct brcmf_if *if
23 ndev->needed_headroom += drvr->hdrlen;
24 ndev->ethtool_ops = &brcmf_ethtool_ops;
25
26 - drvr->rxsz = ndev->mtu + ndev->hard_header_len +
27 - drvr->hdrlen;
28 -
29 /* set the mac address */
30 memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
31
32 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
33 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
34 @@ -112,15 +112,11 @@ struct brcmf_pub {
35
36 /* Internal brcmf items */
37 uint hdrlen; /* Total BRCMF header length (proto + bus) */
38 - uint rxsz; /* Rx buffer size bus module should use */
39
40 /* Dongle media info */
41 char fwver[BRCMF_DRIVER_FIRMWARE_VERSION_LEN];
42 u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */
43
44 - /* Multicast data packets sent to dongle */
45 - unsigned long tx_multicast;
46 -
47 struct mac_address addresses[BRCMF_MAX_IFS];
48
49 struct brcmf_if *iflist[BRCMF_MAX_IFS];
50 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
51 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
52 @@ -2104,8 +2104,6 @@ int brcmf_fws_process_skb(struct brcmf_i
53 if ((skb->priority == 0) || (skb->priority > 7))
54 skb->priority = cfg80211_classify8021d(skb, NULL);
55
56 - drvr->tx_multicast += !!multicast;
57 -
58 if (fws->avoid_queueing) {
59 rc = brcmf_proto_txdata(drvr, ifp->ifidx, 0, skb);
60 if (rc < 0)