Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06c01585 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: get rid of brcmf_cfg80211_set_channel() function 



The function does not provide any additional functionality and is
used only once so just get rid of it.

Reviewed-by: default avatarDaniel (Deognyoun) Kim <dekim@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c555ecde

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+7 −21
Original line number Original line Diff line number Diff line
@@ -3733,23 +3733,6 @@ brcmf_config_ap_mgmt_ie(struct brcmf_cfg80211_vif *vif, 
	return err;

	return err;

}

}





static s32

brcmf_cfg80211_set_channel(struct brcmf_cfg80211_info *cfg,

			   struct brcmf_if *ifp,

			   struct ieee80211_channel *channel)

{

	u16 chanspec;

	s32 err;



	brcmf_dbg(TRACE, "band=%d, center_freq=%d\n", channel->band,

		  channel->center_freq);



	chanspec = channel_to_chanspec(&cfg->d11inf, channel);

	err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);



	return err;

}



static s32

static s32

brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,

brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,

			struct cfg80211_ap_settings *settings)

			struct cfg80211_ap_settings *settings)
@@ -3765,9 +3748,11 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, 
	struct brcmf_join_params join_params;

	struct brcmf_join_params join_params;

	enum nl80211_iftype dev_role;

	enum nl80211_iftype dev_role;

	struct brcmf_fil_bss_enable_le bss_enable;

	struct brcmf_fil_bss_enable_le bss_enable;

	u16 chanspec;





	brcmf_dbg(TRACE, "channel=%d, bw=%d, beacon_interval=%d, dtim_period=%d,\n",

	brcmf_dbg(TRACE, "ctrlchn=%d, center=%d, bw=%d, beacon_interval=%d, dtim_period=%d,\n",

		  settings->chandef.chan->hw_value, settings->chandef.width,

		  settings->chandef.chan->hw_value,

		  settings->chandef.center_freq1, settings->chandef.width,

		  settings->beacon_interval, settings->dtim_period);

		  settings->beacon_interval, settings->dtim_period);

	brcmf_dbg(TRACE, "ssid=%s(%zu), auth_type=%d, inactivity_timeout=%d\n",

	brcmf_dbg(TRACE, "ssid=%s(%zu), auth_type=%d, inactivity_timeout=%d\n",

		  settings->ssid, settings->ssid_len, settings->auth_type,

		  settings->ssid, settings->ssid_len, settings->auth_type,
@@ -3825,9 +3810,10 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, 




	brcmf_config_ap_mgmt_ie(ifp->vif, &settings->beacon);

	brcmf_config_ap_mgmt_ie(ifp->vif, &settings->beacon);





	err = brcmf_cfg80211_set_channel(cfg, ifp, settings->chandef.chan);

	chanspec = channel_to_chanspec(&cfg->d11inf, settings->chandef.chan);

	err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);

	if (err < 0) {

	if (err < 0) {

		brcmf_err("Set Channel failed, %d\n", err);

		brcmf_err("Set Channel failed: chspec=%d, %d\n", chanspec, err);

		goto exit;

		goto exit;

	}

	}