aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/bcmdhd/wl_cfg80211.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/bcmdhd/wl_cfg80211.c')
-rw-r--r--drivers/net/wireless/bcmdhd/wl_cfg80211.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 7049d77..3537138 100644
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -7146,7 +7146,7 @@ static int wl_construct_reginfo(struct wl_priv *wl, s32 bw_cap)
return err;
}
-s32 wl_update_wiphybands(struct wl_priv *wl, char *country_code)
+s32 wl_update_wiphybands(struct wl_priv *wl)
{
struct wiphy *wiphy;
struct net_device *dev;
@@ -7157,7 +7157,6 @@ s32 wl_update_wiphybands(struct wl_priv *wl, char *country_code)
int nmode = 0;
int bw_cap = 0;
int index = 0;
- struct regulatory_request *new_request;
bool rollback_lock = false;
WL_DBG(("Entry"));
@@ -7226,23 +7225,6 @@ s32 wl_update_wiphybands(struct wl_priv *wl, char *country_code)
wiphy_apply_custom_regulatory(wiphy, &brcm_regdom);
- if (country_code != NULL) {
- WL_DBG(("country_code[0]=%c, country_code[1]=%c\n", country_code[0], country_code[1]));
- /* Allocate a requlatory request to update cfg80211 for the supported channels */
- new_request = kzalloc(sizeof(struct regulatory_request),
- GFP_KERNEL);
- if (!new_request) {
- WL_ERR(("error Memory alloc for requlatory request failed\n"));
- err = -ENOMEM;
- } else {
- new_request->alpha2[0] = country_code[0];
- new_request->alpha2[1] = country_code[1];
- WL_DBG(("Send an event to cfg80211 to update supplicant to take the new channel list"));
- nl80211_send_reg_change_event(new_request);
- kfree(new_request);
- }
- }
-
end_bands:
if (rollback_lock)
mutex_unlock(&wl->usr_sync);
@@ -7265,7 +7247,7 @@ static s32 __wl_cfg80211_up(struct wl_priv *wl)
if (unlikely(err && err != -EINPROGRESS)) {
WL_ERR(("wl_config_ifmode failed\n"));
}
- err = wl_update_wiphybands(wl, NULL);
+ err = wl_update_wiphybands(wl);
if (unlikely(err)) {
WL_ERR(("wl_update_wiphybands failed\n"));
}