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 <fugang.duan@nxp.com>
Reviewed-by: Haibo Chen <haibo.chen@nxp.com>
(cherry picked from commit: 9b3b65ec3df5ed7b404784ae4ef4cf9f906c0520)

diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 4ae767f..3958b23 100644 (file)
--- 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 f0836bd..4b45bed 100644 (file)
--- 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",