diff options
Diffstat (limited to 'package/kernel/mac80211/patches/329-v4.17-0004-brcmfmac-allocate-struct-brcmf_pub-instance-using-wi.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/329-v4.17-0004-brcmfmac-allocate-struct-brcmf_pub-instance-using-wi.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/package/kernel/mac80211/patches/329-v4.17-0004-brcmfmac-allocate-struct-brcmf_pub-instance-using-wi.patch b/package/kernel/mac80211/patches/329-v4.17-0004-brcmfmac-allocate-struct-brcmf_pub-instance-using-wi.patch index 6f400088b1..a2914d4e69 100644 --- a/package/kernel/mac80211/patches/329-v4.17-0004-brcmfmac-allocate-struct-brcmf_pub-instance-using-wi.patch +++ b/package/kernel/mac80211/patches/329-v4.17-0004-brcmfmac-allocate-struct-brcmf_pub-instance-using-wi.patch @@ -139,7 +139,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> u32 nmode = 0; u32 vhtmode = 0; u32 bw_cap[2] = { WLC_BW_20MHZ_BIT, WLC_BW_20MHZ_BIT }; -@@ -6764,8 +6768,8 @@ static s32 brcmf_translate_country_code( +@@ -6765,8 +6769,8 @@ static s32 brcmf_translate_country_code( static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy, struct regulatory_request *req) { @@ -150,7 +150,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> struct brcmf_fil_country_le ccreq; s32 err; int i; -@@ -6800,7 +6804,7 @@ static void brcmf_cfg80211_reg_notifier( +@@ -6801,7 +6805,7 @@ static void brcmf_cfg80211_reg_notifier( brcmf_err("Firmware rejected country setting\n"); return; } @@ -159,7 +159,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> } static void brcmf_free_wiphy(struct wiphy *wiphy) -@@ -6827,17 +6831,15 @@ static void brcmf_free_wiphy(struct wiph +@@ -6828,17 +6832,15 @@ static void brcmf_free_wiphy(struct wiph if (wiphy->wowlan != &brcmf_wowlan_support) kfree(wiphy->wowlan); #endif @@ -179,7 +179,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> struct brcmf_cfg80211_vif *vif; struct brcmf_if *ifp; s32 err = 0; -@@ -6849,26 +6851,13 @@ struct brcmf_cfg80211_info *brcmf_cfg802 +@@ -6850,26 +6852,13 @@ struct brcmf_cfg80211_info *brcmf_cfg802 return NULL; } @@ -209,7 +209,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> cfg->pub = drvr; init_vif_event(&cfg->vif_event); INIT_LIST_HEAD(&cfg->vif_list); -@@ -6877,6 +6866,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802 +@@ -6878,6 +6867,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802 if (IS_ERR(vif)) goto wiphy_out; @@ -217,7 +217,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> vif->ifp = ifp; vif->wdev.netdev = ndev; ndev->ieee80211_ptr = &vif->wdev; -@@ -6903,6 +6893,11 @@ struct brcmf_cfg80211_info *brcmf_cfg802 +@@ -6904,6 +6894,11 @@ struct brcmf_cfg80211_info *brcmf_cfg802 if (err < 0) goto priv_out; @@ -229,7 +229,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> brcmf_dbg(INFO, "Registering custom regulatory\n"); wiphy->reg_notifier = brcmf_cfg80211_reg_notifier; wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG; -@@ -6916,13 +6911,17 @@ struct brcmf_cfg80211_info *brcmf_cfg802 +@@ -6917,13 +6912,17 @@ struct brcmf_cfg80211_info *brcmf_cfg802 cap = &wiphy->bands[NL80211_BAND_2GHZ]->ht_cap.cap; *cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40; } @@ -248,7 +248,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> if (err) { brcmf_err("Setting wiphy bands failed (%d)\n", err); goto wiphy_unreg_out; -@@ -6939,12 +6938,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802 +@@ -6940,12 +6939,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802 else *cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; } @@ -262,7 +262,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> err = brcmf_fweh_activate_events(ifp); if (err) { brcmf_err("FWEH activation failed (%d)\n", err); -@@ -7004,8 +6998,7 @@ priv_out: +@@ -7005,8 +6999,7 @@ priv_out: ifp->vif = NULL; wiphy_out: brcmf_free_wiphy(wiphy); @@ -272,7 +272,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> return NULL; } -@@ -7016,7 +7009,8 @@ void brcmf_cfg80211_detach(struct brcmf_ +@@ -7017,7 +7010,8 @@ void brcmf_cfg80211_detach(struct brcmf_ brcmf_btcoex_detach(cfg); wiphy_unregister(cfg->wiphy); @@ -349,16 +349,16 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_REVINFO, --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -1036,7 +1036,7 @@ int brcmf_bus_started(struct device *dev +@@ -1008,7 +1008,7 @@ int brcmf_bus_started(struct device *dev - brcmf_fws_add_interface(ifp); + brcmf_proto_add_if(drvr, ifp); - drvr->config = brcmf_cfg80211_attach(drvr, bus_if->dev, + drvr->config = brcmf_cfg80211_attach(drvr, drvr->cfg80211_ops, drvr->settings->p2p_enable); if (drvr->config == NULL) { ret = -ENOMEM; -@@ -1095,17 +1095,26 @@ fail: +@@ -1063,17 +1063,26 @@ fail: int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) { @@ -388,7 +388,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> for (i = 0; i < ARRAY_SIZE(drvr->if2bss); i++) drvr->if2bss[i] = BRCMF_BSSIDX_INVALID; -@@ -1134,10 +1143,12 @@ int brcmf_attach(struct device *dev, str +@@ -1102,10 +1111,12 @@ int brcmf_attach(struct device *dev, str /* attach firmware event handler */ brcmf_fweh_attach(drvr); @@ -401,15 +401,15 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> return ret; } -@@ -1195,6 +1206,7 @@ void brcmf_detach(struct device *dev) +@@ -1163,6 +1174,7 @@ void brcmf_detach(struct device *dev) brcmf_remove_interface(drvr->iflist[i], false); brcmf_cfg80211_detach(drvr->config); + drvr->config = NULL; - brcmf_fws_deinit(drvr); + brcmf_bus_stop(drvr->bus_if); -@@ -1204,7 +1216,7 @@ void brcmf_detach(struct device *dev) +@@ -1170,7 +1182,7 @@ void brcmf_detach(struct device *dev) brcmf_debug_detach(drvr); bus_if->drvr = NULL; @@ -428,7 +428,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> struct brcmf_cfg80211_info *config; /* Internal brcmf items */ -@@ -143,6 +144,9 @@ struct brcmf_pub { +@@ -141,6 +142,9 @@ struct brcmf_pub { struct notifier_block inetaddr_notifier; struct notifier_block inet6addr_notifier; struct brcmf_mp_device *settings; |