]> Pileus Git - ~andy/linux/commitdiff
zd1211rw: add 0x49 -> JP regulatory domain map
authorKouhei Sutou <kou@clear-code.com>
Wed, 16 Jun 2010 12:53:59 +0000 (21:53 +0900)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 16 Jun 2010 18:39:44 +0000 (14:39 -0400)
0x49 is used by PLANEX GW-US54GXS (2019:5303).

Signed-off-by: Kouhei Sutou <kou@clear-code.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/net/wireless/zd1211rw/zd_mac.h

index 163a8a06b22d0a91243db13ecc6a433e5128ab8b..faf45f163a57f731a326a4f8b1c00e7bd66d7729 100644 (file)
@@ -43,6 +43,7 @@ static struct zd_reg_alpha2_map reg_alpha2_map[] = {
        { 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_SPAIN, "ES" },
        { ZD_REGDOMAIN_FRANCE, "FR" },
 };
index 630c298a730ec468e43601900c1c4119b54aa106..7ab19d5455ff1fbf03237a2b5c7f2eb25d3a8861 100644 (file)
@@ -214,6 +214,7 @@ struct zd_mac {
 #define ZD_REGDOMAIN_FRANCE    0x32
 #define ZD_REGDOMAIN_JAPAN_ADD 0x40
 #define ZD_REGDOMAIN_JAPAN     0x41
+#define ZD_REGDOMAIN_JAPAN_GW_US54GXS  0x49
 
 enum {
        MIN_CHANNEL24 = 1,