diff options
| author | Arend van Spriel <arend.vanspriel@broadcom.com> | 2019-07-11 11:05:06 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2019-07-24 14:51:21 +0300 |
| commit | a84a60ccdd65278485fb495f468a5ab91a75c649 (patch) | |
| tree | 5b5b31ea736aada9be77a03661d106cbabce0b52 /drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h | |
| parent | fa9050927fa885410055ee03c948c2252693d296 (diff) | |
| download | linux-stable-a84a60ccdd65278485fb495f468a5ab91a75c649.tar.gz linux-stable-a84a60ccdd65278485fb495f468a5ab91a75c649.tar.bz2 linux-stable-a84a60ccdd65278485fb495f468a5ab91a75c649.zip | |
Revert "brcmfmac: fix NULL pointer derefence during USB disconnect"
This reverts commit 5cdb0ef6144f47440850553579aa923c20a63f23. Subsequent
changes make rework the driver code fixing the issue differently.
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h index 102e6938905c..b051d2860cd1 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h @@ -7,16 +7,14 @@ #ifdef CONFIG_BRCMFMAC_PROTO_BCDC int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr); -void brcmf_proto_bcdc_detach_pre_delif(struct brcmf_pub *drvr); -void brcmf_proto_bcdc_detach_post_delif(struct brcmf_pub *drvr); +void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr); void brcmf_proto_bcdc_txflowblock(struct device *dev, bool state); void brcmf_proto_bcdc_txcomplete(struct device *dev, struct sk_buff *txp, bool success); struct brcmf_fws_info *drvr_to_fws(struct brcmf_pub *drvr); #else static inline int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) { return 0; } -static void brcmf_proto_bcdc_detach_pre_delif(struct brcmf_pub *drvr) {}; -static inline void brcmf_proto_bcdc_detach_post_delif(struct brcmf_pub *drvr) {} +static inline void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr) {} #endif #endif /* BRCMFMAC_BCDC_H */ |