From 38f1deda4edd8fd5b07fde86cc67a400516054b3 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 12 Jun 2017 23:00:38 -0700 Subject: [PATCH] qcacld-3.0: Fix clang warnings implicit enum nl80211_band warning: implicit conversion from enumeration type 'enum nl80211_band' to different enumeration type 'enum ieee80211_band' [-Wenum-conversion] Change-Id: I084e015626611ae90be00b11a599ae82f9bf6f60 CRs-Fixed: 2055487 --- core/hdd/inc/wlan_hdd_main.h | 8 ++++++++ core/hdd/src/wlan_hdd_assoc.c | 4 ++-- core/hdd/src/wlan_hdd_cfg80211.c | 12 ++++++------ core/hdd/src/wlan_hdd_main.c | 4 ++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 98d43c5fa2c2..322e1d4dc9e1 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -92,6 +92,14 @@ #define NUM_TX_QUEUES 4 #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)) +#define HDD_NL80211_BAND_2GHZ NL80211_BAND_2GHZ +#define HDD_NL80211_BAND_5GHZ NL80211_BAND_5GHZ +#else +#define HDD_NL80211_BAND_2GHZ IEEE80211_BAND_2GHZ +#define HDD_NL80211_BAND_5GHZ IEEE80211_BAND_5GHZ +#endif + /** Length of the TX queue for the netdev */ #define HDD_NETDEV_TX_QUEUE_LEN (3000) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 74a2fe80f68f..3a245949d4da 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -3208,10 +3208,10 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter, if (chan_no <= 14) freq = ieee80211_channel_to_frequency(chan_no, - NL80211_BAND_2GHZ); + HDD_NL80211_BAND_2GHZ); else freq = ieee80211_channel_to_frequency(chan_no, - NL80211_BAND_5GHZ); + HDD_NL80211_BAND_5GHZ); chan = ieee80211_get_channel(pAdapter->wdev.wiphy, freq); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index b569c3cad84e..b70fede5603c 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -177,7 +177,7 @@ } #define HDD5GHZCHAN(freq, chan, flag) { \ - .band = NL80211_BAND_5GHZ, \ + .band = HDD_NL80211_BAND_5GHZ, \ .center_freq = (freq), \ .hw_value = (chan), \ .flags = (flag), \ @@ -315,7 +315,7 @@ static struct ieee80211_rate a_mode_rates[] = { static struct ieee80211_supported_band wlan_hdd_band_2_4_ghz = { .channels = NULL, .n_channels = ARRAY_SIZE(hdd_channels_2_4_ghz), - .band = NL80211_BAND_2GHZ, + .band = HDD_NL80211_BAND_2GHZ, .bitrates = g_mode_rates, .n_bitrates = g_mode_rates_size, .ht_cap.ht_supported = 1, @@ -6694,11 +6694,11 @@ static int __wlan_hdd_cfg80211_get_preferred_freq_list(struct wiphy *wiphy, if (pcl[i] <= ARRAY_SIZE(hdd_channels_2_4_ghz)) freq_list[i] = ieee80211_channel_to_frequency(pcl[i], - NL80211_BAND_2GHZ); + HDD_NL80211_BAND_2GHZ); else freq_list[i] = ieee80211_channel_to_frequency(pcl[i], - NL80211_BAND_5GHZ); + HDD_NL80211_BAND_5GHZ); } /* send the freq_list back to supplicant */ @@ -13467,12 +13467,12 @@ struct cfg80211_bss *wlan_hdd_cfg80211_inform_bss_frame(hdd_adapter_t *pAdapter, (wiphy->bands[NL80211_BAND_2GHZ] != NULL)) { freq = ieee80211_channel_to_frequency(chan_no, - NL80211_BAND_2GHZ); + HDD_NL80211_BAND_2GHZ); } else if ((chan_no > ARRAY_SIZE(hdd_channels_2_4_ghz)) && (wiphy->bands[NL80211_BAND_5GHZ] != NULL)) { freq = ieee80211_channel_to_frequency(chan_no, - NL80211_BAND_5GHZ); + HDD_NL80211_BAND_5GHZ); } else { hdd_err("Invalid channel: %d", chan_no); qdf_mem_free(mgmt); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index c8e032251e8a..08ae14c70ea9 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4589,10 +4589,10 @@ void hdd_connect_result(struct net_device *dev, const u8 *bssid, if (chan_no <= 14) freq = ieee80211_channel_to_frequency(chan_no, - NL80211_BAND_2GHZ); + HDD_NL80211_BAND_2GHZ); else freq = ieee80211_channel_to_frequency(chan_no, - NL80211_BAND_5GHZ); + HDD_NL80211_BAND_5GHZ); chan = ieee80211_get_channel(padapter->wdev.wiphy, freq); bss = hdd_cfg80211_get_bss(padapter->wdev.wiphy, chan, bssid,