--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -50,12 +50,9 @@ static int __ath_regd_init(struct ath_re
 #define ATH_5GHZ_5725_5850	REG_RULE(5725-10, 5850+10, 80, 0, 30,\
 					 NL80211_RRF_NO_IR)
 
-#define ATH_2GHZ_ALL		ATH_2GHZ_CH01_11, \
-				ATH_2GHZ_CH12_13, \
-				ATH_2GHZ_CH14
+#define ATH_2GHZ_ALL     REG_RULE(2400, 2483, 40, 0, 30, 0)
 
-#define ATH_5GHZ_ALL		ATH_5GHZ_5150_5350, \
-				ATH_5GHZ_5470_5850
+#define ATH_5GHZ_ALL     REG_RULE(5140, 5860, 40, 0, 30, 0)
 
 /* This one skips what we call "mid band" */
 #define ATH_5GHZ_NO_MIDBAND	ATH_5GHZ_5150_5350, \
@@ -77,9 +74,8 @@ static const struct ieee80211_regdomain
 	.n_reg_rules = 4,
 	.alpha2 =  "99",
 	.reg_rules = {
-		ATH_2GHZ_CH01_11,
-		ATH_2GHZ_CH12_13,
-		ATH_5GHZ_NO_MIDBAND,
+		ATH_2GHZ_ALL,
+		ATH_5GHZ_ALL,
 	}
 };
 
@@ -88,8 +84,8 @@ static const struct ieee80211_regdomain
 	.n_reg_rules = 3,
 	.alpha2 =  "99",
 	.reg_rules = {
-		ATH_2GHZ_CH01_11,
-		ATH_5GHZ_NO_MIDBAND,
+		ATH_2GHZ_ALL,
+		ATH_5GHZ_ALL,
 	}
 };
 
@@ -98,7 +94,7 @@ static const struct ieee80211_regdomain
 	.n_reg_rules = 3,
 	.alpha2 =  "99",
 	.reg_rules = {
-		ATH_2GHZ_CH01_11,
+		ATH_2GHZ_ALL,
 		ATH_5GHZ_ALL,
 	}
 };
@@ -108,8 +104,7 @@ static const struct ieee80211_regdomain
 	.n_reg_rules = 4,
 	.alpha2 =  "99",
 	.reg_rules = {
-		ATH_2GHZ_CH01_11,
-		ATH_2GHZ_CH12_13,
+		ATH_2GHZ_ALL,
 		ATH_5GHZ_ALL,
 	}
 };
@@ -258,9 +253,7 @@ static bool ath_is_radar_freq(u16 center
 			      struct ath_regulatory *reg)
 
 {
-	if (reg->country_code == CTRY_INDIA)
-		return (center_freq >= 5500 && center_freq <= 5700);
-	return (center_freq >= 5260 && center_freq <= 5700);
+	return false;
 }
 
 static void ath_force_clear_no_ir_chan(struct wiphy *wiphy,