From f9897d08c5b1949c9561a88f3bf1f26780bc18cd Mon Sep 17 00:00:00 2001 From: kimocoder Date: Sat, 26 Jan 2019 01:07:47 +0100 Subject: [PATCH] Fix build error + compiler warnings --- os_dep/linux/ioctl_cfg80211.c | 6 ------ os_dep/linux/wifi_regd.c | 10 ++-------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 6ca9976..4318d7d 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -45,12 +45,6 @@ #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) - #define IEEE80211_BAND_2GHZ NL80211_BAND_2GHZ - #define IEEE80211_BAND_5GHZ NL80211_BAND_5GHZ - #define ieee80211_band nl80211_band -#endif - #define RTW_MAX_MGMT_TX_CNT (8) #define RTW_MAX_MGMT_TX_MS_GAS (500) diff --git a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c index 8903232..936d8cd 100644 --- a/os_dep/linux/wifi_regd.c +++ b/os_dep/linux/wifi_regd.c @@ -19,12 +19,6 @@ #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) - #define IEEE80211_BAND_2GHZ NL80211_BAND_2GHZ - #define IEEE80211_BAND_5GHZ NL80211_BAND_5GHZ - #define IEEE80211_NUM_BANDS NL80211_NUM_BANDS -#endif - static struct country_code_to_enum_rd allCountries[] = { {COUNTRY_CODE_USER, "RD"}, }; @@ -342,11 +336,11 @@ static void _rtw_reg_apply_flags(struct wiphy *wiphy) if (ch) ch->flags &= ~(IEEE80211_CHAN_DISABLED|IEEE80211_CHAN_NO_HT40PLUS| IEEE80211_CHAN_NO_HT40MINUS|IEEE80211_CHAN_NO_80MHZ| - IEEE80211_CHAN_NO_160MHZ|IEEE80211_CHAN_NO_IR); + IEEE80211_CHAN_NO_160MHZ); #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) IEEE80211_CHAN_NO_IBSS|IEEE80211_CHAN_PASSIVE_SCAN); #else - IEEE80211_CHAN_NO_IR); + IEEE80211_CHAN_NO_IR; #endif //ch->flags = IEEE80211_CHAN_DISABLED; }