diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-07-04 18:08:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-07-04 18:08:53 +1000 |
| commit | 3771098a8b1ab63da90830397562e90fbe56cd52 (patch) | |
| tree | 0e30e72adb523b0d8c20dfa55984754443447c5b /net | |
| parent | e10213607bbb91a6f4396739410f9dbbb3a6f4cd (diff) | |
| parent | 0587a9a2869c6143725fcb2b17d9cb829d37ffed (diff) | |
| download | linux-next-3771098a8b1ab63da90830397562e90fbe56cd52.tar.gz | |
Merge branch 'akpm/master'
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/chan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index da49c0b1fd32..b0e11b6dc994 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -715,7 +715,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; |