Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / net / wireless / chan.c

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index bb3d64e..0f50622 100644 (file)
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -716,7 +716,7 @@ static bool cfg80211_ir_permissive_chan(struct wiphy *wiphy,
 
        ASSERT_RTNL();
 
-       if (!config_enabled(CONFIG_CFG80211_REG_RELAX_NO_IR) ||
+       if (!IS_ENABLED(CONFIG_CFG80211_REG_RELAX_NO_IR) ||
            !(wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR))
                return false;