351-0049-brcmfmac-drop-unused-fields-from-struct-brcmf_pub.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  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. They seem to be there from the first day. We calculate these values but
  9. never use them.
  10. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  11. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  12. ---
  13. drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 3 ---
  14. drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h | 4 ----
  15. drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 2 --
  16. 3 files changed, 9 deletions(-)
  17. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  18. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  19. @@ -508,9 +508,6 @@ int brcmf_net_attach(struct brcmf_if *if
  20. ndev->hard_header_len += drvr->hdrlen;
  21. ndev->ethtool_ops = &brcmf_ethtool_ops;
  22. - drvr->rxsz = ndev->mtu + ndev->hard_header_len +
  23. - drvr->hdrlen;
  24. -
  25. /* set the mac address */
  26. memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
  27. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
  28. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
  29. @@ -112,15 +112,11 @@ struct brcmf_pub {
  30. /* Internal brcmf items */
  31. uint hdrlen; /* Total BRCMF header length (proto + bus) */
  32. - uint rxsz; /* Rx buffer size bus module should use */
  33. /* Dongle media info */
  34. char fwver[BRCMF_DRIVER_FIRMWARE_VERSION_LEN];
  35. u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */
  36. - /* Multicast data packets sent to dongle */
  37. - unsigned long tx_multicast;
  38. -
  39. struct mac_address addresses[BRCMF_MAX_IFS];
  40. struct brcmf_if *iflist[BRCMF_MAX_IFS];
  41. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
  42. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
  43. @@ -2104,8 +2104,6 @@ int brcmf_fws_process_skb(struct brcmf_i
  44. if (!skb->priority)
  45. skb->priority = cfg80211_classify8021d(skb, NULL);
  46. - drvr->tx_multicast += !!multicast;
  47. -
  48. if (fws->avoid_queueing) {
  49. rc = brcmf_proto_txdata(drvr, ifp->ifidx, 0, skb);
  50. if (rc < 0)