diff options
Diffstat (limited to 'package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch b/package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch index 0472290f6c..e870cc7572 100644 --- a/package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch +++ b/package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch @@ -1,3 +1,4 @@ +From b50ddfa8530e9b5f52e873fdd6ff04f327a88799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> Date: Fri, 17 Jun 2016 12:29:21 +0200 Subject: [PATCH] brcmfmac: fix lockup when removing P2P interface after event @@ -20,10 +21,15 @@ unregister_netdevice when needed. Signed-off-by: RafaÅ MiÅecki <zajec5@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> --- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 29 +++++++++++++--------- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 4 +-- + 4 files changed, 21 insertions(+), 16 deletions(-) --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -705,12 +705,16 @@ fail: +@@ -733,12 +733,16 @@ fail: return -EBADE; } @@ -44,7 +50,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> } void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on) -@@ -808,7 +812,7 @@ struct brcmf_if *brcmf_add_if(struct brc +@@ -836,7 +840,7 @@ struct brcmf_if *brcmf_add_if(struct brc brcmf_err("ERROR: netdev:%s already exists\n", ifp->ndev->name); netif_stop_queue(ifp->ndev); @@ -53,7 +59,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> drvr->iflist[bsscfgidx] = NULL; } else { brcmf_dbg(INFO, "netdev:%s ignore IF event\n", -@@ -856,7 +860,8 @@ struct brcmf_if *brcmf_add_if(struct brc +@@ -884,7 +888,8 @@ struct brcmf_if *brcmf_add_if(struct brc return ifp; } @@ -63,16 +69,16 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> { struct brcmf_if *ifp; -@@ -885,7 +890,7 @@ static void brcmf_del_if(struct brcmf_pu - cancel_work_sync(&ifp->setmacaddr_work); +@@ -914,7 +919,7 @@ static void brcmf_del_if(struct brcmf_pu cancel_work_sync(&ifp->multicast_work); + cancel_work_sync(&ifp->ndoffload_work); } - brcmf_net_detach(ifp->ndev); + brcmf_net_detach(ifp->ndev, rtnl_locked); } else { /* Only p2p device interfaces which get dynamically created * end up here. In this case the p2p module should be informed -@@ -899,14 +904,14 @@ static void brcmf_del_if(struct brcmf_pu +@@ -928,14 +933,14 @@ static void brcmf_del_if(struct brcmf_pu } } @@ -89,19 +95,19 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> } #ifdef CONFIG_INET -@@ -1154,9 +1159,9 @@ fail: - brcmf_fws_deinit(drvr); - } - if (ifp) -- brcmf_net_detach(ifp->ndev); -+ brcmf_net_detach(ifp->ndev, false); - if (p2p_ifp) -- brcmf_net_detach(p2p_ifp->ndev); -+ brcmf_net_detach(p2p_ifp->ndev, false); - drvr->iflist[0] = NULL; - drvr->iflist[1] = NULL; - if (brcmf_ignoring_probe_fail(drvr)) -@@ -1222,7 +1227,7 @@ void brcmf_detach(struct device *dev) +@@ -1242,9 +1247,9 @@ fail: + brcmf_fws_deinit(drvr); + } + if (ifp) +- brcmf_net_detach(ifp->ndev); ++ brcmf_net_detach(ifp->ndev, false); + if (p2p_ifp) +- brcmf_net_detach(p2p_ifp->ndev); ++ brcmf_net_detach(p2p_ifp->ndev, false); + drvr->iflist[0] = NULL; + drvr->iflist[1] = NULL; + if (drvr->settings->ignore_probe_fail) +@@ -1313,7 +1318,7 @@ void brcmf_detach(struct device *dev) /* make sure primary interface removed last */ for (i = BRCMF_MAX_IFS-1; i > -1; i--) @@ -112,7 +118,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h -@@ -213,7 +213,7 @@ struct brcmf_if *brcmf_get_ifp(struct br +@@ -220,7 +220,7 @@ struct brcmf_if *brcmf_get_ifp(struct br int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked); struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx, bool is_p2pdev, char *name, u8 *mac_addr); @@ -123,7 +129,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success); --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c -@@ -226,7 +226,7 @@ static void brcmf_fweh_handle_if_event(s +@@ -183,7 +183,7 @@ static void brcmf_fweh_handle_if_event(s err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data); if (ifp && ifevent->action == BRCMF_E_IF_DEL) @@ -134,7 +140,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> /** --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c -@@ -2279,7 +2279,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiph +@@ -2289,7 +2289,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiph err = 0; } if (err) @@ -143,7 +149,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> brcmf_cfg80211_arm_vif_event(cfg, NULL); if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE) -@@ -2385,7 +2385,7 @@ void brcmf_p2p_detach(struct brcmf_p2p_i +@@ -2395,7 +2395,7 @@ void brcmf_p2p_detach(struct brcmf_p2p_i if (vif != NULL) { brcmf_p2p_cancel_remain_on_channel(vif->ifp); brcmf_p2p_deinit_discovery(p2p); |