zd1211rw: change ZD_REGDOMAIN_JAPAN_* naming

ZD_REGDOMAIN_JAPAN_ADD and ZD_REGDOMAIN_JAPAN_GW_US54GXS seem a little
verbose to me...

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index faf45f1..43307bd 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -42,8 +42,8 @@ static struct zd_reg_alpha2_map reg_alpha2_map[] = {
        { ZD_REGDOMAIN_IC, "CA" },
        { ZD_REGDOMAIN_ETSI, "DE" }, /* Generic ETSI, use most restrictive */
        { ZD_REGDOMAIN_JAPAN, "JP" },
-       { ZD_REGDOMAIN_JAPAN_ADD, "JP" },
-       { ZD_REGDOMAIN_JAPAN_GW_US54GXS, "JP" },
+       { ZD_REGDOMAIN_JAPAN_2, "JP" },
+       { ZD_REGDOMAIN_JAPAN_3, "JP" },
        { ZD_REGDOMAIN_SPAIN, "ES" },
        { ZD_REGDOMAIN_FRANCE, "FR" },
 };

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
index 7ab19d5..d21739a 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -212,9 +212,9 @@ struct zd_mac {
 #define ZD_REGDOMAIN_ETSI      0x30
 #define ZD_REGDOMAIN_SPAIN     0x31
 #define ZD_REGDOMAIN_FRANCE    0x32
-#define ZD_REGDOMAIN_JAPAN_ADD 0x40
+#define ZD_REGDOMAIN_JAPAN_2   0x40
 #define ZD_REGDOMAIN_JAPAN     0x41
-#define ZD_REGDOMAIN_JAPAN_GW_US54GXS  0x49
+#define ZD_REGDOMAIN_JAPAN_3   0x49
 
 enum {
        MIN_CHANNEL24 = 1,