diff --git a/net-wireless/compat-wireless/Manifest b/net-wireless/compat-wireless/Manifest
index f28cc2244..8219c1161 100644
--- a/net-wireless/compat-wireless/Manifest
+++ b/net-wireless/compat-wireless/Manifest
@@ -10,7 +10,7 @@ AUX 4099-2.6.32-rc7-mac80211-security-fixes.patch 5951 RMD160 fb07610df222a12f81
 AUX WEXT-EXT-nuts.patch 3150 RMD160 a89ceb7e6f34e4b2be1b8c35ed8ed141c20a2f20 SHA1 d71520c21765fcec6f710970df40e1091d2feb75 SHA256 be6a5f2746ff6cf5963e95b1c7a895cc343c930de22a47e41b4ed0d24a60a6f0
 AUX ath9k_htc_ethtool_driver.patch 1242 RMD160 49838be1d386765166b357be2a3ac59746a4c850 SHA1 16cb804d64ce0ec21b509052bbd7004554147657 SHA256 b27463b3f6cfe64e6b09835e1a06bc3ae83207f6800710ff0c461a6bef363460
 AUX ath_ignore_eeprom.patch 2096 RMD160 87f268cfcf06115464b64377e5dd05bfc467203d SHA1 ffb607d19a8622f0a9ea11ee09269f0af2a1ea28 SHA256 def6985a8c1486bfe78c8cf72333f620d88730fc1c3116d016a03725a6ba2226
-AUX ath_regd_optional.patch 937 RMD160 9aa9f04ad7d9e3ec1db563e7dbc8c28b37a831bd SHA1 a6722934f97fb6959b2d046f68725cf074fcb81a SHA256 3ae16a86452218743043142486050398e16261ec63c4730c13a4abd7f8f8a866
+AUX ath_regd_optional.patch 906 RMD160 5e5abcc041e1830b6aabef27d5cb83f99f6d8130 SHA1 e42973161cbde89cccdd04408c83b3cc5918202a SHA256 ebf117d071363e854505c18aef8c9af2652fd4a7b9cc5efe961cf5efb410dbd7
 AUX blinky.patch 357 RMD160 6c93e916efc56412f316076e836c1c5d98e58047 SHA1 e23568801309cdf2a01fa5be8cd3b9a3fcff5edd SHA256 1c2f0e18ecbcf2c07ba732671e77408326d2566d260f0252002c5698f9e65e30
 AUX channel-negative-one-maxim.patch 1021 RMD160 39a56a0fdc4c5932e507985c5a213b703ff8df7c SHA1 a611acdd7994b07b0b39417ef7a5a6ffc866a733 SHA256 19f7fc0753636c32026e444e23bd101bd21cfeb59661284678bf157dc35212f2
 AUX compat-chaos.patch 6187 RMD160 2b8477fbf8b8bde456c5c32a8146330232ae355f SHA1 7bd56bcb3c50eb6f22be7ec24b886ae70bf747cd SHA256 5e8c11b46bc8acf10a2ce8b934fec32662b57c003c99e5e0ca4717a8c6b19474
diff --git a/net-wireless/compat-wireless/files/ath_regd_optional.patch b/net-wireless/compat-wireless/files/ath_regd_optional.patch
index e3e37e800..415fc896b 100644
--- a/net-wireless/compat-wireless/files/ath_regd_optional.patch
+++ b/net-wireless/compat-wireless/files/ath_regd_optional.patch
@@ -1,45 +1,38 @@
---- a/drivers/net/wireless/ath/regd.c
-+++ b/drivers/net/wireless/ath/regd.c
-@@ -193,6 +193,10 @@ ath_reg_apply_beaconing_flags(struct wip
+diff -Naur compat-wireless-3.0-rc4-1-orig/drivers/net/wireless/ath/regd.c compat-wireless-3.0-rc4-1/drivers/net/wireless/ath/regd.c
+--- compat-wireless-3.0-rc4-1-orig/drivers/net/wireless/ath/regd.c	2011-06-23 19:02:22.000000000 -0400
++++ compat-wireless-3.0-rc4-1/drivers/net/wireless/ath/regd.c	2011-06-26 01:52:35.000000000 -0400
+@@ -193,6 +193,8 @@
  	u32 bandwidth = 0;
  	int r;
  
-+#ifdef ATH_USER_REGD
 +	return;
-+#endif
 +
  	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
  
  		if (!wiphy->bands[band])
-@@ -252,6 +256,10 @@ ath_reg_apply_active_scan_flags(struct w
+@@ -252,6 +254,8 @@
  	u32 bandwidth = 0;
  	int r;
  
-+#ifdef ATH_USER_REGD
 +	return;
-+#endif
 +
  	sband = wiphy->bands[IEEE80211_BAND_2GHZ];
  
  	/*
-@@ -299,6 +307,10 @@ static void ath_reg_apply_radar_flags(st
+@@ -299,6 +303,8 @@
  	struct ieee80211_channel *ch;
  	unsigned int i;
  
-+#ifdef ATH_USER_REGD
 +	return;
-+#endif
 +
  	if (!wiphy->bands[IEEE80211_BAND_5GHZ])
  		return;
  
-@@ -466,6 +478,10 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -466,6 +472,8 @@
  {
  	const struct ieee80211_regdomain *regd;
  
-+#ifdef ATH_USER_REGD
 +	return 0;
-+#endif
 +
  	wiphy->reg_notifier = reg_notifier;
  	wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;