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

Commit 4ed5d521 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: pass correct band parameter to ieee80211_channel_to_frequency() 



ieee80211_channel_to_frequency() routine expects band parameter in
the form of "enum ieee80211_band band". Currently driver specific
band (BAND_A, BAND_AN etc.) is passed to the routine.

This patch makes sure that correct parameter is passed.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5116f3ce

drivers/net/wireless/mwifiex/cfg80211.c

+3 −1
Original line number Diff line number Diff line
@@ -768,6 +768,7 @@ static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv) 
	struct mwifiex_bss_info bss_info;

	int ie_len;

	u8 ie_buf[IEEE80211_MAX_SSID_LEN + sizeof(struct ieee_types_header)];

	enum ieee80211_band band;



	if (mwifiex_get_bss_info(priv, &bss_info))

		return -1;
@@ -780,9 +781,10 @@ static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv) 
			bss_info.ssid.ssid_len);

	ie_len = ie_buf[1] + sizeof(struct ieee_types_header);



	band = mwifiex_band_to_radio_type(priv->curr_bss_params.band);

	chan = __ieee80211_get_channel(priv->wdev->wiphy,

			ieee80211_channel_to_frequency(bss_info.bss_chan,

						priv->curr_bss_params.band));

						       band));



	cfg80211_inform_bss(priv->wdev->wiphy, chan,

		bss_info.bssid, 0, WLAN_CAPABILITY_IBSS,

drivers/net/wireless/mwifiex/sta_ioctl.c

+3 −2
Original line number Diff line number Diff line
@@ -655,6 +655,7 @@ mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, int channel) 
	u16 curr_chan = 0;

	struct cfg80211_bss *bss = NULL;

	struct ieee80211_channel *chan;

	enum ieee80211_band band;



	memset(&bss_info, 0, sizeof(bss_info));
@@ -691,9 +692,9 @@ mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, int channel) 
		goto done;

	}



	band = mwifiex_band_to_radio_type(priv->curr_bss_params.band);

	chan = __ieee80211_get_channel(priv->wdev->wiphy,

			ieee80211_channel_to_frequency(channel,

						priv->curr_bss_params.band));

			ieee80211_channel_to_frequency(channel, band));



	/* Find the BSS we want using available scan results */

	bss = cfg80211_get_bss(priv->wdev->wiphy, chan, bss_info.bssid,