diff options
author | Kouhei Sutou <kou@clear-code.com> | 2010-06-16 08:53:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-16 14:39:44 -0400 |
commit | 71184ba482f800254f0a825e3c8b1752a1a7a36d (patch) | |
tree | 7e589ffd5be739056ba15769043be0271bd20c3c /drivers/net/wireless/zd1211rw | |
parent | d7ca21393d39cb2e73dfc4c516e7be37ba01789e (diff) |
zd1211rw: add 0x49 -> JP regulatory domain map
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>
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 163a8a06b22d..faf45f163a57 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -43,6 +43,7 @@ static struct zd_reg_alpha2_map reg_alpha2_map[] = { | |||
43 | { ZD_REGDOMAIN_ETSI, "DE" }, /* Generic ETSI, use most restrictive */ | 43 | { ZD_REGDOMAIN_ETSI, "DE" }, /* Generic ETSI, use most restrictive */ |
44 | { ZD_REGDOMAIN_JAPAN, "JP" }, | 44 | { ZD_REGDOMAIN_JAPAN, "JP" }, |
45 | { ZD_REGDOMAIN_JAPAN_ADD, "JP" }, | 45 | { ZD_REGDOMAIN_JAPAN_ADD, "JP" }, |
46 | { ZD_REGDOMAIN_JAPAN_GW_US54GXS, "JP" }, | ||
46 | { ZD_REGDOMAIN_SPAIN, "ES" }, | 47 | { ZD_REGDOMAIN_SPAIN, "ES" }, |
47 | { ZD_REGDOMAIN_FRANCE, "FR" }, | 48 | { ZD_REGDOMAIN_FRANCE, "FR" }, |
48 | }; | 49 | }; |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h index 630c298a730e..7ab19d5455ff 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.h +++ b/drivers/net/wireless/zd1211rw/zd_mac.h | |||
@@ -214,6 +214,7 @@ struct zd_mac { | |||
214 | #define ZD_REGDOMAIN_FRANCE 0x32 | 214 | #define ZD_REGDOMAIN_FRANCE 0x32 |
215 | #define ZD_REGDOMAIN_JAPAN_ADD 0x40 | 215 | #define ZD_REGDOMAIN_JAPAN_ADD 0x40 |
216 | #define ZD_REGDOMAIN_JAPAN 0x41 | 216 | #define ZD_REGDOMAIN_JAPAN 0x41 |
217 | #define ZD_REGDOMAIN_JAPAN_GW_US54GXS 0x49 | ||
217 | 218 | ||
218 | enum { | 219 | enum { |
219 | MIN_CHANNEL24 = 1, | 220 | MIN_CHANNEL24 = 1, |