| --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c |
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c |
| @@ -58,19 +58,12 @@ |
| (((c) < 149) ? 3 : 4)))) |
| |
| #define BRCM_2GHZ_2412_2462 REG_RULE(2412-10, 2462+10, 40, 0, 19, 0) |
| -#define BRCM_2GHZ_2467_2472 REG_RULE(2467-10, 2472+10, 20, 0, 19, \ |
| - NL80211_RRF_NO_IR) |
| +#define BRCM_2GHZ_2467_2472 REG_RULE(2467-10, 2472+10, 20, 0, 19, 0) |
| |
| -#define BRCM_5GHZ_5180_5240 REG_RULE(5180-10, 5240+10, 40, 0, 21, \ |
| - NL80211_RRF_NO_IR) |
| -#define BRCM_5GHZ_5260_5320 REG_RULE(5260-10, 5320+10, 40, 0, 21, \ |
| - NL80211_RRF_DFS | \ |
| - NL80211_RRF_NO_IR) |
| -#define BRCM_5GHZ_5500_5700 REG_RULE(5500-10, 5700+10, 40, 0, 21, \ |
| - NL80211_RRF_DFS | \ |
| - NL80211_RRF_NO_IR) |
| -#define BRCM_5GHZ_5745_5825 REG_RULE(5745-10, 5825+10, 40, 0, 21, \ |
| - NL80211_RRF_NO_IR) |
| +#define BRCM_5GHZ_5180_5240 REG_RULE(5180-10, 5240+10, 40, 0, 21, 0) |
| +#define BRCM_5GHZ_5260_5320 REG_RULE(5260-10, 5320+10, 40, 0, 21, 0) |
| +#define BRCM_5GHZ_5500_5700 REG_RULE(5500-10, 5700+10, 40, 0, 21, 0) |
| +#define BRCM_5GHZ_5745_5825 REG_RULE(5745-10, 5825+10, 40, 0, 21, 0) |
| |
| static const struct ieee80211_regdomain brcms_regdom_x2 = { |
| .n_reg_rules = 6, |