From 174c3fcf46e4ade1da91e71d25599ebdb29c28f6 Mon Sep 17 00:00:00 2001 From: Arif Hussain Date: Thu, 28 Jul 2016 11:19:42 -0700 Subject: qcacld-3.0: Avoid sending invalid frequency to ieee80211_frequency_to_channel Avoid converting invalid frequency i.e zero frequency to channel using ieee80211_frequency_to_channel() function. Change-Id: I4a32591e313183348180a1d30a950b4b174a27cc CRs-Fixed: 1047642 --- core/hdd/src/wlan_hdd_hostapd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 3a9882ba55c5..999144621acb 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -6436,12 +6436,15 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, */ channel = ieee80211_frequency_to_channel(chandef->chan->center_freq); + if (NL80211_CHAN_WIDTH_80P80 == chandef->width || - NL80211_CHAN_WIDTH_160 == chandef->width) - channel_seg2 = - ieee80211_frequency_to_channel(chandef->center_freq2); - else - channel_seg2 = 0; + NL80211_CHAN_WIDTH_160 == chandef->width) { + if (chandef->center_freq2) + channel_seg2 = ieee80211_frequency_to_channel( + chandef->center_freq2); + else + hdd_err("Invalid center_freq2"); + } /* Check freq range */ if ((WNI_CFG_CURRENT_CHANNEL_STAMIN > channel) || -- cgit v1.2.3