From 80fcd03fef8fc1d4dff0afc43eae96486454b26f Mon Sep 17 00:00:00 2001 From: Amitkumar Karwar Date: Wed, 21 Sep 2011 21:43:24 -0700 Subject: [PATCH] --- yaml --- r: 266367 b: refs/heads/master c: 4ed5d521b062b7256dcfe46a3194f89ff44fdc66 h: refs/heads/master i: 266365: c55cd244bd965390fda80cbed24d1458a18fec17 266363: 494e8f97c50ff3d6a76894e322d6b13a34b8f653 266359: 6e25120b755cbeebaad02044cbecd6fc0a52a433 266351: 0e610b3d873f63aabad264b8159579514fa2a225 266335: 7749c95637695228b589fec4e6e66733b2acb717 266303: a05e8ebef0cf7a942cb9c467a13b0014535319f4 266239: 79d1193d4f9a44b874ec8089d10a7c49d00f5c12 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/cfg80211.c | 4 +++- trunk/drivers/net/wireless/mwifiex/sta_ioctl.c | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fba2481b043b..7f61a23e52dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5116f3cef206e7fcd6023ba8595a6321f33c2044 +refs/heads/master: 4ed5d521b062b7256dcfe46a3194f89ff44fdc66 diff --git a/trunk/drivers/net/wireless/mwifiex/cfg80211.c b/trunk/drivers/net/wireless/mwifiex/cfg80211.c index 62932c2a587e..0ddcdca63cf7 100644 --- a/trunk/drivers/net/wireless/mwifiex/cfg80211.c +++ b/trunk/drivers/net/wireless/mwifiex/cfg80211.c @@ -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, diff --git a/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c b/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c index 157d312f77be..a9dfeb1b4ace 100644 --- a/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c +++ b/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c @@ -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,