--- a/drivers/net/wireless/zd1211rw/zd_chip.c	2006-10-23 10:07:39.000000000 -0400
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c	2006-10-23 10:41:51.000000000 -0400
@@ -38,6 +38,8 @@ void zd_chip_init(struct zd_chip *chip,
 	mutex_init(&chip->mutex);
 	zd_usb_init(&chip->usb, netdev, intf);
 	zd_rf_init(&chip->rf);
+	/* The chip needs to know which geo it is in */
+	chip->geo = ieee80211_get_geo(zd_mac_to_ieee80211(zd_netdev_mac(netdev)));
 }
 
 void zd_chip_clear(struct zd_chip *chip)
@@ -606,14 +608,17 @@ static int patch_6m_band_edge(struct zd_
 		{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
 		{ CR47,  0x1e },
 	};
+	struct ieee80211_geo *geo = chip->geo;
 
 	if (!chip->patch_6m_band_edge || !chip->rf.patch_6m_band_edge)
 		return 0;
 
-	/* FIXME: Channel 11 is not the edge for all regulatory domains. */
-	if (channel == 1 || channel == 11)
+	/* Checks the channel boundry of the region */
+	dev_dbg_f("checking boundry : %d , %d\n" , 1 , geo->bg_channels);
+	if (channel == 1 || channel == geo->bg_channels)
 		ioreqs[0].value = 0x12;
 
+
 	dev_dbg_f(zd_chip_dev(chip), "patching for channel %d\n", channel);
 	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
 }
--- a/drivers/net/wireless/zd1211rw/zd_chip.h	2006-10-23 10:07:39.000000000 -0400
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h	2006-10-23 10:39:08.000000000 -0400
@@ -21,6 +21,8 @@
 #include "zd_types.h"
 #include "zd_rf.h"
 #include "zd_usb.h"
+#include "zd_ieee80211.h"
+#include <linux/wireless.h>
 
 /* Header for the Media Access Controller (MAC) and the Baseband Processor
  * (BBP). It appears that the ZD1211 wraps the old ZD1205 with USB glue and
@@ -669,6 +671,7 @@ struct zd_chip {
 	/* SetPointOFDM in the vendor driver */
 	u8 ofdm_cal_values[3][E2P_CHANNEL_COUNT];
 	u16 link_led;
+  	struct ieee80211_geo* geo;
 	unsigned int pa_type:4,
 		patch_cck_gain:1, patch_cr157:1, patch_6m_band_edge:1,
 		new_phy_layout:1,