aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-10-19 17:12:31 -0400
committerJames Ketrenos <jketreno@linux.intel.com>2005-11-07 18:52:05 -0500
commit035205760e4f28082fedb258a20c804746c84ffe (patch)
tree5d13b9c6287f1e6f753f859026920e9c67f53689 /drivers/net
parent991d1cc5963f4926478f3139ec0b0dd26a2c888c (diff)
Added channel support for ipw2200 cards identified as 'ZZR'
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ipw2200.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 750e43e9310a..081957ab1194 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -10495,6 +10495,17 @@ static const struct ieee80211_geo ipw_geos[] = {
10495 {5210, 42}, {5230, 46}}, 10495 {5210, 42}, {5230, 46}},
10496 }, 10496 },
10497 10497
10498 { /* Rest of World */
10499 "ZZR",
10500 .bg_channels = 14,
10501 .bg = {{2412, 1}, {2417, 2}, {2422, 3},
10502 {2427, 4}, {2432, 5}, {2437, 6},
10503 {2442, 7}, {2447, 8}, {2452, 9},
10504 {2457, 10}, {2462, 11}, {2467, 12},
10505 {2472, 13}, {2484, 14, IEEE80211_CH_B_ONLY |
10506 IEEE80211_CH_PASSIVE_ONLY}},
10507 },
10508
10498 { /* High Band */ 10509 { /* High Band */
10499 "ZZH", 10510 "ZZH",
10500 .bg_channels = 13, 10511 .bg_channels = 13,
@@ -10711,8 +10722,13 @@ static int ipw_up(struct ipw_priv *priv)
10711 ipw_geos[j].name, 3)) 10722 ipw_geos[j].name, 3))
10712 break; 10723 break;
10713 } 10724 }
10714 if (j == ARRAY_SIZE(ipw_geos)) 10725 if (j == ARRAY_SIZE(ipw_geos)) {
10726 IPW_WARNING("SKU [%c%c%c] not recognized.\n",
10727 priv->eeprom[EEPROM_COUNTRY_CODE + 0],
10728 priv->eeprom[EEPROM_COUNTRY_CODE + 1],
10729 priv->eeprom[EEPROM_COUNTRY_CODE + 2]);
10715 j = 0; 10730 j = 0;
10731 }
10716 if (ipw_set_geo(priv->ieee, &ipw_geos[j])) { 10732 if (ipw_set_geo(priv->ieee, &ipw_geos[j])) {
10717 IPW_WARNING("Could not set geography."); 10733 IPW_WARNING("Could not set geography.");
10718 return 0; 10734 return 0;