Merge "wil6210: add option to ignore OTA regulatory hints"

This commit is contained in:
Linux Build Service Account 2017-05-04 08:45:28 -07:00 committed by Gerrit - the friendly Code Review server
commit baf0fa8f1e

View file

@ -26,6 +26,10 @@ bool disable_ap_sme;
module_param(disable_ap_sme, bool, 0444);
MODULE_PARM_DESC(disable_ap_sme, " let user space handle AP mode SME");
static bool ignore_reg_hints = true;
module_param(ignore_reg_hints, bool, 0444);
MODULE_PARM_DESC(ignore_reg_hints, " Ignore OTA regulatory hints (Default: true)");
#define CHAN60G(_channel, _flags) { \
.band = IEEE80211_BAND_60GHZ, \
.center_freq = 56160 + (2160 * (_channel)), \
@ -1743,6 +1747,11 @@ static void wil_wiphy_init(struct wiphy *wiphy)
wiphy->vendor_commands = wil_nl80211_vendor_commands;
wiphy->vendor_events = wil_nl80211_vendor_events;
wiphy->n_vendor_events = ARRAY_SIZE(wil_nl80211_vendor_events);
if (ignore_reg_hints) {
wiphy->regulatory_flags |= REGULATORY_DISABLE_BEACON_HINTS;
wiphy->regulatory_flags |= REGULATORY_COUNTRY_IE_IGNORE;
}
}
struct wireless_dev *wil_cfg80211_init(struct device *dev)