brcmfmac: regression fixes
cover brcmfmac: regression fixes
This series contains fixes regression made by new functionality in the driver. The Kconfig fix was reported. The other two changes were found during internal testing.
This series is intended for v3.17 kernel and applies to the master branch of the wireless repository.
Arend van Spriel (2):
brcmfmac: conditionally compile firmware protocol source code
brcmfmac: obtain ifp through wdev structure
Hante Meuleman (1):
brcmfmac: Fix memory leak and missing assignment.
drivers/net/wireless/brcm80211/Kconfig | 10 ++++++++++ drivers/net/wireless/brcm80211/brcmfmac/Makefile | 10 ++++++---- drivers/net/wireless/brcm80211/brcmfmac/bcdc.h | 7 +++++-- drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h | 11 +++++++++-- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 9 +++++++-- 5 files changed, 37 insertions(+), 10 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/3 brcmfmac: Fix memory leak and missing assignment.
From: Hante Meuleman <[email protected]>
The function brcmf_enable_bw40_2g contains a memory leak. The function is also missing initialisation of one of the members of ch struct, which can lead to warning but this has no impact on result.
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +2 -0
@@ -5143,6 +5143,7 @@ static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg) ch.band =BRCMU_CHAN_BAND_2G ; ch.bw =BRCMU_CHAN_BW_40 ; + ch.sb =BRCMU_CHAN_SB_NONE ; ch.chnum =0 ; cfg->d11inf.encchspec (&ch);
@@ -5176,6 +5177,7 @@ static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)brcmf_update_bw40_channel_flag (&band->channels[j], &ch); } +kfree (pbuf); }return err; }
Signature · 1 line
1.9.1
PATCH 2/3 brcmfmac: conditionally compile firmware protocol source code
In reply to Arend van SprielThe host-interface can select which protocol implementation it needs. Selecting PCIe will include the msgbuf protocol and selecting USB and/or SDIO will include the bcdc protocol. The PCIe kconfig option assures the dependencies for msgbuf are met, ie. HAS_DMA.
--- drivers/net/wireless/brcm80211/Kconfig | 10 ++++++++++ drivers/net/wireless/brcm80211/brcmfmac/Makefile | 10 ++++++---- drivers/net/wireless/brcm80211/brcmfmac/bcdc.h | 7 +++++-- drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h | 11 +++++++++-- 4 files changed, 30 insertions(+), 8 deletions(-)
drivers/net/wireless/brcm80211/Kconfig +10 -0
@@ -27,10 +27,17 @@ config BRCMFMAC one of the bus interface support. If you choose to build a module, it'll be called brcmfmac.ko. +config BRCMFMAC_PROTO_BCDC + bool + +config BRCMFMAC_PROTO_MSGBUF + bool + config BRCMFMAC_SDIO bool "SDIO bus interface support for FullMAC driver" depends on (MMC = y || MMC = BRCMFMAC) depends on BRCMFMAC + select BRCMFMAC_PROTO_BCDC select FW_LOADER default y ---help---
@@ -42,6 +49,7 @@ config BRCMFMAC_USB bool "USB bus interface support for FullMAC driver" depends on (USB = y || USB = BRCMFMAC) depends on BRCMFMAC + select BRCMFMAC_PROTO_BCDC select FW_LOADER ---help--- This option enables the USB bus interface support for Broadcom
@@ -52,6 +60,8 @@ config BRCMFMAC_PCIE bool "PCIE bus interface support for FullMAC driver" depends on BRCMFMAC depends on PCI + depends on HAS_DMA + select BRCMFMAC_PROTO_MSGBUF select FW_LOADER ---help--- This option enables the PCIE bus interface support for Broadcom
drivers/net/wireless/brcm80211/brcmfmac/Makefile +6 -4
@@ -30,16 +30,18 @@ brcmfmac-objs += \ fwsignal.o \ p2p.o \ proto.o \ - bcdc.o \ - commonring.o \ - flowring.o \ - msgbuf.o \ dhd_common.o \ dhd_linux.o \ firmware.o \ feature.o \ btcoex.o \ vendor.o +brcmfmac-$(CONFIG_BRCMFMAC_PROTO_BCDC) += \ + bcdc.o +brcmfmac-$(CONFIG_BRCMFMAC_PROTO_MSGBUF) += \ + commonring.o \ + flowring.o \ + msgbuf.o brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \ dhd_sdio.o \ bcmsdh.o
drivers/net/wireless/brcm80211/brcmfmac/bcdc.h +5 -2
@@ -16,9 +16,12 @@#ifndef BRCMFMAC_BCDC_H #define BRCMFMAC_BCDC_H - +#ifdef CONFIG_BRCMFMAC_PROTO_BCDC int brcmf_proto_bcdc_attach (struct brcmf_pub *drvr);void brcmf_proto_bcdc_detach (struct brcmf_pub *drvr); - +#else +static inline int brcmf_proto_bcdc_attach (struct brcmf_pub *drvr) {return 0 ; } +static inline void brcmf_proto_bcdc_detach (struct brcmf_pub *drvr) {} +#endif #endif /* BRCMFMAC_BCDC_H */
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h +9 -2
@@ -15,6 +15,7 @@#ifndef BRCMFMAC_MSGBUF_H #define BRCMFMAC_MSGBUF_H +#ifdef CONFIG_BRCMFMAC_PROTO_MSGBUF #define BRCMF_H2D_MSGRING_CONTROL_SUBMIT_MAX_ITEM 20#define BRCMF_H2D_MSGRING_RXPOST_SUBMIT_MAX_ITEM 256
@@ -32,9 +33,15 @@int brcmf_proto_msgbuf_rx_trigger (struct device *dev); +void brcmf_msgbuf_delete_flowring (struct brcmf_pub *drvr,u8 flowid);int brcmf_proto_msgbuf_attach (struct brcmf_pub *drvr);void brcmf_proto_msgbuf_detach (struct brcmf_pub *drvr); -void brcmf_msgbuf_delete_flowring (struct brcmf_pub *drvr,u8 flowid); - +#else +static inline int brcmf_proto_msgbuf_attach (struct brcmf_pub *drvr) +{ +return 0 ; +} +static inline void brcmf_proto_msgbuf_detach (struct brcmf_pub *drvr) {} +#endif #endif /* BRCMFMAC_MSGBUF_H */
Signature · 1 line
1.9.1
PATCH 3/3 brcmfmac: obtain ifp through wdev structure
In reply to Arend van SprielFor P2P_DEVICE interface the function brcmf_cfg80211_update_proto_addr_mode() resulted in a crash, because it assumed wdev->netdev would be valid. The ifp should be obtained through the driver vif structure which contains the wireless_dev.
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +5 -2
@@ -497,8 +497,11 @@ brcmf_configure_arp_offload(struct brcmf_if *ifp, bool enable)static void brcmf_cfg80211_update_proto_addr_mode (struct wireless_dev *wdev) { -struct net_device *ndev = wdev->netdev; -struct brcmf_if *ifp =netdev_priv (ndev); +struct brcmf_cfg80211_vif *vif; +struct brcmf_if *ifp; + + vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev); + ifp = vif->ifp; if ((wdev->iftype == NL80211_IFTYPE_ADHOC) || (wdev->iftype == NL80211_IFTYPE_AP) ||
Signature · 1 line
1.9.1