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 /drivers/net/wireless/ath/ath6kl/cfg80211.c | |
| parent | e10213607bbb91a6f4396739410f9dbbb3a6f4cd (diff) | |
| parent | 0587a9a2869c6143725fcb2b17d9cb829d37ffed (diff) | |
| download | linux-next-3771098a8b1ab63da90830397562e90fbe56cd52.tar.gz | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 4e11ba06f089..f6b5390ea50d 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -3870,7 +3870,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) BIT(NL80211_IFTYPE_P2P_CLIENT); } - if (config_enabled(CONFIG_ATH6KL_REGDOMAIN) && + if (IS_ENABLED(CONFIG_ATH6KL_REGDOMAIN) && test_bit(ATH6KL_FW_CAPABILITY_REGDOMAIN, ar->fw_capabilities)) { wiphy->reg_notifier = ath6kl_cfg80211_reg_notify; ar->wiphy->features |= NL80211_FEATURE_CELL_BASE_REG_HINTS; |