mac80211: brcmfmac: backport patches that were skipped previously #2

[15.05/openwrt.git] / package / kernel / mac80211 / patches / 351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch

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 e870cc7..e991f32 100644 (file)
--- 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
@@ -29,7 +29,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-@@ -733,12 +733,16 @@ fail:
+@@ -548,12 +548,16 @@ fail:
        return -EBADE;
  }
  
@@ -50,7 +50,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  }
  
  void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on)
-@@ -836,7 +840,7 @@ struct brcmf_if *brcmf_add_if(struct brc
+@@ -651,7 +655,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);
@@ -59,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",
-@@ -884,7 +888,8 @@ struct brcmf_if *brcmf_add_if(struct brc
+@@ -699,7 +703,8 @@ struct brcmf_if *brcmf_add_if(struct brc
        return ifp;
  }
  
@@ -69,7 +69,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  {
        struct brcmf_if *ifp;
  
-@@ -914,7 +919,7 @@ static void brcmf_del_if(struct brcmf_pu
+@@ -729,7 +734,7 @@ static void brcmf_del_if(struct brcmf_pu
                        cancel_work_sync(&ifp->multicast_work);
                        cancel_work_sync(&ifp->ndoffload_work);
                }
@@ -78,7 +78,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
        } else {
                /* Only p2p device interfaces which get dynamically created
                 * end up here. In this case the p2p module should be informed
-@@ -928,14 +933,14 @@ static void brcmf_del_if(struct brcmf_pu
+@@ -743,14 +748,14 @@ static void brcmf_del_if(struct brcmf_pu
        }
  }
  
@@ -95,7 +95,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  }
  
  #ifdef CONFIG_INET
-@@ -1242,9 +1247,9 @@ fail:
+@@ -1057,9 +1062,9 @@ fail:
                brcmf_fws_deinit(drvr);
        }
        if (ifp)
@@ -107,7 +107,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
        drvr->iflist[0] = NULL;
        drvr->iflist[1] = NULL;
        if (drvr->settings->ignore_probe_fail)
-@@ -1313,7 +1318,7 @@ void brcmf_detach(struct device *dev)
+@@ -1128,7 +1133,7 @@ void brcmf_detach(struct device *dev)
  
        /* make sure primary interface removed last */
        for (i = BRCMF_MAX_IFS-1; i > -1; i--)
@@ -118,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
-@@ -220,7 +220,7 @@ struct brcmf_if *brcmf_get_ifp(struct br
+@@ -216,7 +216,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);