diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 12:47:46 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 12:47:46 -0400 |
| commit | 368bc8a7d97b23d90829de9aefb85dbae07d5a51 (patch) | |
| tree | ef8b29bbd3b0fda1e3fc6abe213df7d8707062fb | |
| parent | 260ee9c42efb927ae5de4e03c646f78b589f7658 (diff) | |
| download | longterm-queue-4.18-368bc8a7d97b23d90829de9aefb85dbae07d5a51.tar.gz | |
brcmfmac: ctxt refresh
| -rw-r--r-- | queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch b/queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch index f0c9f36..660c28d 100644 --- a/queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch +++ b/queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch @@ -1,4 +1,4 @@ -From 24d413a31afaee9bbbf79226052c386b01780ce2 Mon Sep 17 00:00:00 2001 +From 84566eb10bec2c039cf33dfde4b73d6d86abdd35 Mon Sep 17 00:00:00 2001 From: Piotr Figiel <p.figiel@camlintechnologies.com> Date: Wed, 13 Mar 2019 09:52:01 +0000 Subject: [PATCH] brcmfmac: fix Oops when bringing up interface during USB @@ -87,10 +87,10 @@ Signed-off-by: Piotr Figiel <p.figiel@camlintechnologies.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -index 6faeb761c27e..7d6a08779693 100644 +index 6d1ff9fc278b..c2ed9ceb7b34 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -841,17 +841,17 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx, +@@ -759,17 +759,17 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx, bool rtnl_locked) { struct brcmf_if *ifp; @@ -99,7 +99,7 @@ index 6faeb761c27e..7d6a08779693 100644 ifp = drvr->iflist[bsscfgidx]; - drvr->iflist[bsscfgidx] = NULL; if (!ifp) { - bphy_err(drvr, "Null interface, bsscfgidx=%d\n", bsscfgidx); + brcmf_err("Null interface, bsscfgidx=%d\n", bsscfgidx); return; } brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", bsscfgidx, @@ -111,7 +111,7 @@ index 6faeb761c27e..7d6a08779693 100644 if (ifp->ndev) { if (bsscfgidx == 0) { if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) { -@@ -879,6 +879,10 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx, +@@ -797,6 +797,10 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx, brcmf_p2p_ifp_removed(ifp, rtnl_locked); kfree(ifp); } |