From 0fbebe2d3b61d7e5e80a19d015818ead2b9b75e4 Mon Sep 17 00:00:00 2001 From: Andy Duan Date: Thu, 10 May 2018 19:49:48 +0800 Subject: [PATCH] MLK-18275 wireless: bcmdhd: fix the un-supported country code set by regdb Driver should return when un-supported country code set by regdb. Signed-off-by: Fugang Duan Reviewed-by: Haibo Chen (cherry picked from commit: 9b3b65ec3df5ed7b404784ae4ef4cf9f906c0520) --- drivers/net/wireless/bcmdhd/wl_cfg80211.c | 5 +++++ drivers/net/wireless/bcmdhd_1363/wl_cfg80211.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 4ae767f0603d..3958b2332faa 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -8110,6 +8110,11 @@ wl_cfg80211_reg_notifier( /* in case of no supported country by regdb lets driver setup platform default Locale */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) + return -EINVAL; +#else + return; +#endif /* kernel version < 3.9.0 */ } WL_ERR(("Set country code %c%c from %s\n", diff --git a/drivers/net/wireless/bcmdhd_1363/wl_cfg80211.c b/drivers/net/wireless/bcmdhd_1363/wl_cfg80211.c index f0836bd9865d..4b45bed183be 100644 --- a/drivers/net/wireless/bcmdhd_1363/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd_1363/wl_cfg80211.c @@ -9428,6 +9428,11 @@ wl_cfg80211_reg_notifier( /* in case of no supported country by regdb lets driver setup platform default Locale */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) + return -EINVAL; +#else + return; +#endif /* kernel version < 3.9.0 */ } WL_ERR(("Set country code %c%c from %s\n", -- 2.17.1