|
| 1 | +diff -Naur v7-kernel/drivers/net/wireless/ath/regd.c v7-kernel.ath-regd/drivers/net/wireless/ath/regd.c |
| 2 | +--- v7-kernel/drivers/net/wireless/ath/regd.c 2018-04-05 16:35:15.000000000 +0200 |
| 3 | ++++ v7-kernel.ath-regd/drivers/net/wireless/ath/regd.c 2018-04-09 12:11:07.691651027 +0200 |
| 4 | +@@ -33,22 +33,16 @@ |
| 5 | + */ |
| 6 | + |
| 7 | + /* Only these channels all allow active scan on all world regulatory domains */ |
| 8 | +-#define ATH9K_2GHZ_CH01_11 REG_RULE(2412-10, 2462+10, 40, 0, 20, 0) |
| 9 | ++#define ATH9K_2GHZ_CH01_11 REG_RULE(2312-10, 2462+10, 40, 0, 30, 0) |
| 10 | + |
| 11 | + /* We enable active scan on these a case by case basis by regulatory domain */ |
| 12 | +-#define ATH9K_2GHZ_CH12_13 REG_RULE(2467-10, 2472+10, 40, 0, 20,\ |
| 13 | +- NL80211_RRF_NO_IR) |
| 14 | +-#define ATH9K_2GHZ_CH14 REG_RULE(2484-10, 2484+10, 40, 0, 20,\ |
| 15 | +- NL80211_RRF_NO_IR | \ |
| 16 | +- NL80211_RRF_NO_OFDM) |
| 17 | ++#define ATH9K_2GHZ_CH12_13 REG_RULE(2467-10, 2472+10, 40, 0, 30, 0) |
| 18 | ++#define ATH9K_2GHZ_CH14 REG_RULE(2484-10, 2732+10, 40, 0, 30, 0) |
| 19 | + |
| 20 | + /* We allow IBSS on these on a case by case basis by regulatory domain */ |
| 21 | +-#define ATH9K_5GHZ_5150_5350 REG_RULE(5150-10, 5350+10, 80, 0, 30,\ |
| 22 | +- NL80211_RRF_NO_IR) |
| 23 | +-#define ATH9K_5GHZ_5470_5850 REG_RULE(5470-10, 5850+10, 80, 0, 30,\ |
| 24 | +- NL80211_RRF_NO_IR) |
| 25 | +-#define ATH9K_5GHZ_5725_5850 REG_RULE(5725-10, 5850+10, 80, 0, 30,\ |
| 26 | +- NL80211_RRF_NO_IR) |
| 27 | ++#define ATH9K_5GHZ_5150_5350 REG_RULE(4920-10, 5350+10, 80, 0, 30, 0) |
| 28 | ++#define ATH9K_5GHZ_5470_5850 REG_RULE(5470-10, 6100+10, 80, 0, 30, 0) |
| 29 | ++#define ATH9K_5GHZ_5725_5850 REG_RULE(5725-10, 6100+10, 80, 0, 30, 0) |
| 30 | + |
| 31 | + #define ATH9K_2GHZ_ALL ATH9K_2GHZ_CH01_11, \ |
| 32 | + ATH9K_2GHZ_CH12_13, \ |
| 33 | +@@ -77,9 +71,8 @@ |
| 34 | + .n_reg_rules = 4, |
| 35 | + .alpha2 = "99", |
| 36 | + .reg_rules = { |
| 37 | +- ATH9K_2GHZ_CH01_11, |
| 38 | +- ATH9K_2GHZ_CH12_13, |
| 39 | +- ATH9K_5GHZ_NO_MIDBAND, |
| 40 | ++ ATH9K_2GHZ_ALL, |
| 41 | ++ ATH9K_5GHZ_ALL, |
| 42 | + } |
| 43 | + }; |
| 44 | + |
| 45 | +@@ -88,8 +81,8 @@ |
| 46 | + .n_reg_rules = 3, |
| 47 | + .alpha2 = "99", |
| 48 | + .reg_rules = { |
| 49 | +- ATH9K_2GHZ_CH01_11, |
| 50 | +- ATH9K_5GHZ_NO_MIDBAND, |
| 51 | ++ ATH9K_2GHZ_ALL, |
| 52 | ++ ATH9K_5GHZ_ALL, |
| 53 | + } |
| 54 | + }; |
| 55 | + |
| 56 | +@@ -98,7 +91,7 @@ |
| 57 | + .n_reg_rules = 3, |
| 58 | + .alpha2 = "99", |
| 59 | + .reg_rules = { |
| 60 | +- ATH9K_2GHZ_CH01_11, |
| 61 | ++ ATH9K_2GHZ_ALL, |
| 62 | + ATH9K_5GHZ_ALL, |
| 63 | + } |
| 64 | + }; |
| 65 | +@@ -108,8 +101,7 @@ |
| 66 | + .n_reg_rules = 4, |
| 67 | + .alpha2 = "99", |
| 68 | + .reg_rules = { |
| 69 | +- ATH9K_2GHZ_CH01_11, |
| 70 | +- ATH9K_2GHZ_CH12_13, |
| 71 | ++ ATH9K_2GHZ_ALL, |
| 72 | + ATH9K_5GHZ_ALL, |
| 73 | + } |
| 74 | + }; |
| 75 | +@@ -258,9 +250,10 @@ |
| 76 | + struct ath_regulatory *reg) |
| 77 | + |
| 78 | + { |
| 79 | +- if (reg->country_code == CTRY_INDIA) |
| 80 | +- return (center_freq >= 5500 && center_freq <= 5700); |
| 81 | +- return (center_freq >= 5260 && center_freq <= 5700); |
| 82 | ++// if (reg->country_code == CTRY_INDIA) |
| 83 | ++// return (center_freq >= 5500 && center_freq <= 5700); |
| 84 | ++// return (center_freq >= 5260 && center_freq <= 5700); |
| 85 | ++ return 0; |
| 86 | + } |
| 87 | + |
| 88 | + static void ath_force_clear_no_ir_chan(struct wiphy *wiphy, |
0 commit comments