aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00/ipw2200.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2009-08-20 14:48:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-28 14:40:28 -0400
commitb0a4e7d8a291de63f35b04464de9ab4a83d38a7c (patch)
treec95a79b15483070bf1ca92ddf7b7e9ba4d4af026 /drivers/net/wireless/ipw2x00/ipw2200.c
parent01a0ac417ce9b4f1216a266f2fd454cffefc5aee (diff)
libipw: switch from ieee80211_* to libipw_* naming policy
This eliminates the dual definition of ieee80211_channel (and possibly others), further clarifying who defines what and paving the way for inclusion of cfg80211.h. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2200.c')
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.c902
1 files changed, 451 insertions, 451 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 8e18d5348350..3617e3c1e9ed 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -111,7 +111,7 @@ static int qos_no_ack_mask = 0;
111static int burst_duration_CCK = 0; 111static int burst_duration_CCK = 0;
112static int burst_duration_OFDM = 0; 112static int burst_duration_OFDM = 0;
113 113
114static struct ieee80211_qos_parameters def_qos_parameters_OFDM = { 114static struct libipw_qos_parameters def_qos_parameters_OFDM = {
115 {QOS_TX0_CW_MIN_OFDM, QOS_TX1_CW_MIN_OFDM, QOS_TX2_CW_MIN_OFDM, 115 {QOS_TX0_CW_MIN_OFDM, QOS_TX1_CW_MIN_OFDM, QOS_TX2_CW_MIN_OFDM,
116 QOS_TX3_CW_MIN_OFDM}, 116 QOS_TX3_CW_MIN_OFDM},
117 {QOS_TX0_CW_MAX_OFDM, QOS_TX1_CW_MAX_OFDM, QOS_TX2_CW_MAX_OFDM, 117 {QOS_TX0_CW_MAX_OFDM, QOS_TX1_CW_MAX_OFDM, QOS_TX2_CW_MAX_OFDM,
@@ -122,7 +122,7 @@ static struct ieee80211_qos_parameters def_qos_parameters_OFDM = {
122 QOS_TX2_TXOP_LIMIT_OFDM, QOS_TX3_TXOP_LIMIT_OFDM} 122 QOS_TX2_TXOP_LIMIT_OFDM, QOS_TX3_TXOP_LIMIT_OFDM}
123}; 123};
124 124
125static struct ieee80211_qos_parameters def_qos_parameters_CCK = { 125static struct libipw_qos_parameters def_qos_parameters_CCK = {
126 {QOS_TX0_CW_MIN_CCK, QOS_TX1_CW_MIN_CCK, QOS_TX2_CW_MIN_CCK, 126 {QOS_TX0_CW_MIN_CCK, QOS_TX1_CW_MIN_CCK, QOS_TX2_CW_MIN_CCK,
127 QOS_TX3_CW_MIN_CCK}, 127 QOS_TX3_CW_MIN_CCK},
128 {QOS_TX0_CW_MAX_CCK, QOS_TX1_CW_MAX_CCK, QOS_TX2_CW_MAX_CCK, 128 {QOS_TX0_CW_MAX_CCK, QOS_TX1_CW_MAX_CCK, QOS_TX2_CW_MAX_CCK,
@@ -133,7 +133,7 @@ static struct ieee80211_qos_parameters def_qos_parameters_CCK = {
133 QOS_TX3_TXOP_LIMIT_CCK} 133 QOS_TX3_TXOP_LIMIT_CCK}
134}; 134};
135 135
136static struct ieee80211_qos_parameters def_parameters_OFDM = { 136static struct libipw_qos_parameters def_parameters_OFDM = {
137 {DEF_TX0_CW_MIN_OFDM, DEF_TX1_CW_MIN_OFDM, DEF_TX2_CW_MIN_OFDM, 137 {DEF_TX0_CW_MIN_OFDM, DEF_TX1_CW_MIN_OFDM, DEF_TX2_CW_MIN_OFDM,
138 DEF_TX3_CW_MIN_OFDM}, 138 DEF_TX3_CW_MIN_OFDM},
139 {DEF_TX0_CW_MAX_OFDM, DEF_TX1_CW_MAX_OFDM, DEF_TX2_CW_MAX_OFDM, 139 {DEF_TX0_CW_MAX_OFDM, DEF_TX1_CW_MAX_OFDM, DEF_TX2_CW_MAX_OFDM,
@@ -144,7 +144,7 @@ static struct ieee80211_qos_parameters def_parameters_OFDM = {
144 DEF_TX2_TXOP_LIMIT_OFDM, DEF_TX3_TXOP_LIMIT_OFDM} 144 DEF_TX2_TXOP_LIMIT_OFDM, DEF_TX3_TXOP_LIMIT_OFDM}
145}; 145};
146 146
147static struct ieee80211_qos_parameters def_parameters_CCK = { 147static struct libipw_qos_parameters def_parameters_CCK = {
148 {DEF_TX0_CW_MIN_CCK, DEF_TX1_CW_MIN_CCK, DEF_TX2_CW_MIN_CCK, 148 {DEF_TX0_CW_MIN_CCK, DEF_TX1_CW_MIN_CCK, DEF_TX2_CW_MIN_CCK,
149 DEF_TX3_CW_MIN_CCK}, 149 DEF_TX3_CW_MIN_CCK},
150 {DEF_TX0_CW_MAX_CCK, DEF_TX1_CW_MAX_CCK, DEF_TX2_CW_MAX_CCK, 150 {DEF_TX0_CW_MAX_CCK, DEF_TX1_CW_MAX_CCK, DEF_TX2_CW_MAX_CCK,
@@ -164,9 +164,9 @@ static int from_priority_to_tx_queue[] = {
164 164
165static u32 ipw_qos_get_burst_duration(struct ipw_priv *priv); 165static u32 ipw_qos_get_burst_duration(struct ipw_priv *priv);
166 166
167static int ipw_send_qos_params_command(struct ipw_priv *priv, struct ieee80211_qos_parameters 167static int ipw_send_qos_params_command(struct ipw_priv *priv, struct libipw_qos_parameters
168 *qos_param); 168 *qos_param);
169static int ipw_send_qos_info_command(struct ipw_priv *priv, struct ieee80211_qos_information_element 169static int ipw_send_qos_info_command(struct ipw_priv *priv, struct libipw_qos_information_element
170 *qos_param); 170 *qos_param);
171#endif /* CONFIG_IPW2200_QOS */ 171#endif /* CONFIG_IPW2200_QOS */
172 172
@@ -1830,7 +1830,7 @@ static ssize_t store_speed_scan(struct device *d, struct device_attribute *attr,
1830 break; 1830 break;
1831 } 1831 }
1832 1832
1833 if (ieee80211_is_valid_channel(priv->ieee, channel)) 1833 if (libipw_is_valid_channel(priv->ieee, channel))
1834 priv->speed_scan[pos++] = channel; 1834 priv->speed_scan[pos++] = channel;
1835 else 1835 else
1836 IPW_WARNING("Skipping invalid channel request: %d\n", 1836 IPW_WARNING("Skipping invalid channel request: %d\n",
@@ -1882,7 +1882,7 @@ static ssize_t show_channels(struct device *d,
1882 char *buf) 1882 char *buf)
1883{ 1883{
1884 struct ipw_priv *priv = dev_get_drvdata(d); 1884 struct ipw_priv *priv = dev_get_drvdata(d);
1885 const struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee); 1885 const struct libipw_geo *geo = libipw_get_geo(priv->ieee);
1886 int len = 0, i; 1886 int len = 0, i;
1887 1887
1888 len = sprintf(&buf[len], 1888 len = sprintf(&buf[len],
@@ -1892,14 +1892,14 @@ static ssize_t show_channels(struct device *d,
1892 for (i = 0; i < geo->bg_channels; i++) { 1892 for (i = 0; i < geo->bg_channels; i++) {
1893 len += sprintf(&buf[len], "%d: BSS%s%s, %s, Band %s.\n", 1893 len += sprintf(&buf[len], "%d: BSS%s%s, %s, Band %s.\n",
1894 geo->bg[i].channel, 1894 geo->bg[i].channel,
1895 geo->bg[i].flags & IEEE80211_CH_RADAR_DETECT ? 1895 geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT ?
1896 " (radar spectrum)" : "", 1896 " (radar spectrum)" : "",
1897 ((geo->bg[i].flags & IEEE80211_CH_NO_IBSS) || 1897 ((geo->bg[i].flags & LIBIPW_CH_NO_IBSS) ||
1898 (geo->bg[i].flags & IEEE80211_CH_RADAR_DETECT)) 1898 (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT))
1899 ? "" : ", IBSS", 1899 ? "" : ", IBSS",
1900 geo->bg[i].flags & IEEE80211_CH_PASSIVE_ONLY ? 1900 geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY ?
1901 "passive only" : "active/passive", 1901 "passive only" : "active/passive",
1902 geo->bg[i].flags & IEEE80211_CH_B_ONLY ? 1902 geo->bg[i].flags & LIBIPW_CH_B_ONLY ?
1903 "B" : "B/G"); 1903 "B" : "B/G");
1904 } 1904 }
1905 1905
@@ -1909,12 +1909,12 @@ static ssize_t show_channels(struct device *d,
1909 for (i = 0; i < geo->a_channels; i++) { 1909 for (i = 0; i < geo->a_channels; i++) {
1910 len += sprintf(&buf[len], "%d: BSS%s%s, %s.\n", 1910 len += sprintf(&buf[len], "%d: BSS%s%s, %s.\n",
1911 geo->a[i].channel, 1911 geo->a[i].channel,
1912 geo->a[i].flags & IEEE80211_CH_RADAR_DETECT ? 1912 geo->a[i].flags & LIBIPW_CH_RADAR_DETECT ?
1913 " (radar spectrum)" : "", 1913 " (radar spectrum)" : "",
1914 ((geo->a[i].flags & IEEE80211_CH_NO_IBSS) || 1914 ((geo->a[i].flags & LIBIPW_CH_NO_IBSS) ||
1915 (geo->a[i].flags & IEEE80211_CH_RADAR_DETECT)) 1915 (geo->a[i].flags & LIBIPW_CH_RADAR_DETECT))
1916 ? "" : ", IBSS", 1916 ? "" : ", IBSS",
1917 geo->a[i].flags & IEEE80211_CH_PASSIVE_ONLY ? 1917 geo->a[i].flags & LIBIPW_CH_PASSIVE_ONLY ?
1918 "passive only" : "active/passive"); 1918 "passive only" : "active/passive");
1919 } 1919 }
1920 1920
@@ -2429,7 +2429,7 @@ static int ipw_send_tx_power(struct ipw_priv *priv, struct ipw_tx_power *power)
2429 2429
2430static int ipw_set_tx_power(struct ipw_priv *priv) 2430static int ipw_set_tx_power(struct ipw_priv *priv)
2431{ 2431{
2432 const struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee); 2432 const struct libipw_geo *geo = libipw_get_geo(priv->ieee);
2433 struct ipw_tx_power tx_power; 2433 struct ipw_tx_power tx_power;
2434 s8 max_power; 2434 s8 max_power;
2435 int i; 2435 int i;
@@ -2960,12 +2960,12 @@ static int ipw_fw_dma_wait(struct ipw_priv *priv)
2960static void ipw_remove_current_network(struct ipw_priv *priv) 2960static void ipw_remove_current_network(struct ipw_priv *priv)
2961{ 2961{
2962 struct list_head *element, *safe; 2962 struct list_head *element, *safe;
2963 struct ieee80211_network *network = NULL; 2963 struct libipw_network *network = NULL;
2964 unsigned long flags; 2964 unsigned long flags;
2965 2965
2966 spin_lock_irqsave(&priv->ieee->lock, flags); 2966 spin_lock_irqsave(&priv->ieee->lock, flags);
2967 list_for_each_safe(element, safe, &priv->ieee->network_list) { 2967 list_for_each_safe(element, safe, &priv->ieee->network_list) {
2968 network = list_entry(element, struct ieee80211_network, list); 2968 network = list_entry(element, struct libipw_network, list);
2969 if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) { 2969 if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
2970 list_del(element); 2970 list_del(element);
2971 list_add_tail(&network->list, 2971 list_add_tail(&network->list,
@@ -3751,7 +3751,7 @@ static void ipw_queue_tx_free_tfd(struct ipw_priv *priv,
3751 le16_to_cpu(bd->u.data.chunk_len[i]), 3751 le16_to_cpu(bd->u.data.chunk_len[i]),
3752 PCI_DMA_TODEVICE); 3752 PCI_DMA_TODEVICE);
3753 if (txq->txb[txq->q.last_used]) { 3753 if (txq->txb[txq->q.last_used]) {
3754 ieee80211_txb_free(txq->txb[txq->q.last_used]); 3754 libipw_txb_free(txq->txb[txq->q.last_used]);
3755 txq->txb[txq->q.last_used] = NULL; 3755 txq->txb[txq->q.last_used] = NULL;
3756 } 3756 }
3757 } 3757 }
@@ -4070,7 +4070,7 @@ static u32 ipw_get_max_rate(struct ipw_priv *priv)
4070 /* If currently associated in B mode, restrict the maximum 4070 /* If currently associated in B mode, restrict the maximum
4071 * rate match to B rates */ 4071 * rate match to B rates */
4072 if (priv->assoc_request.ieee_mode == IPW_B_MODE) 4072 if (priv->assoc_request.ieee_mode == IPW_B_MODE)
4073 mask &= IEEE80211_CCK_RATES_MASK; 4073 mask &= LIBIPW_CCK_RATES_MASK;
4074 4074
4075 /* TODO: Verify that the rate is supported by the current rates 4075 /* TODO: Verify that the rate is supported by the current rates
4076 * list. */ 4076 * list. */
@@ -4078,29 +4078,29 @@ static u32 ipw_get_max_rate(struct ipw_priv *priv)
4078 while (i && !(mask & i)) 4078 while (i && !(mask & i))
4079 i >>= 1; 4079 i >>= 1;
4080 switch (i) { 4080 switch (i) {
4081 case IEEE80211_CCK_RATE_1MB_MASK: 4081 case LIBIPW_CCK_RATE_1MB_MASK:
4082 return 1000000; 4082 return 1000000;
4083 case IEEE80211_CCK_RATE_2MB_MASK: 4083 case LIBIPW_CCK_RATE_2MB_MASK:
4084 return 2000000; 4084 return 2000000;
4085 case IEEE80211_CCK_RATE_5MB_MASK: 4085 case LIBIPW_CCK_RATE_5MB_MASK:
4086 return 5500000; 4086 return 5500000;
4087 case IEEE80211_OFDM_RATE_6MB_MASK: 4087 case LIBIPW_OFDM_RATE_6MB_MASK:
4088 return 6000000; 4088 return 6000000;
4089 case IEEE80211_OFDM_RATE_9MB_MASK: 4089 case LIBIPW_OFDM_RATE_9MB_MASK:
4090 return 9000000; 4090 return 9000000;
4091 case IEEE80211_CCK_RATE_11MB_MASK: 4091 case LIBIPW_CCK_RATE_11MB_MASK:
4092 return 11000000; 4092 return 11000000;
4093 case IEEE80211_OFDM_RATE_12MB_MASK: 4093 case LIBIPW_OFDM_RATE_12MB_MASK:
4094 return 12000000; 4094 return 12000000;
4095 case IEEE80211_OFDM_RATE_18MB_MASK: 4095 case LIBIPW_OFDM_RATE_18MB_MASK:
4096 return 18000000; 4096 return 18000000;
4097 case IEEE80211_OFDM_RATE_24MB_MASK: 4097 case LIBIPW_OFDM_RATE_24MB_MASK:
4098 return 24000000; 4098 return 24000000;
4099 case IEEE80211_OFDM_RATE_36MB_MASK: 4099 case LIBIPW_OFDM_RATE_36MB_MASK:
4100 return 36000000; 4100 return 36000000;
4101 case IEEE80211_OFDM_RATE_48MB_MASK: 4101 case LIBIPW_OFDM_RATE_48MB_MASK:
4102 return 48000000; 4102 return 48000000;
4103 case IEEE80211_OFDM_RATE_54MB_MASK: 4103 case LIBIPW_OFDM_RATE_54MB_MASK:
4104 return 54000000; 4104 return 54000000;
4105 } 4105 }
4106 4106
@@ -4466,11 +4466,11 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4466 == IEEE80211_STYPE_ASSOC_RESP)) { 4466 == IEEE80211_STYPE_ASSOC_RESP)) {
4467 if ((sizeof 4467 if ((sizeof
4468 (struct 4468 (struct
4469 ieee80211_assoc_response) 4469 libipw_assoc_response)
4470 <= size) 4470 <= size)
4471 && (size <= 2314)) { 4471 && (size <= 2314)) {
4472 struct 4472 struct
4473 ieee80211_rx_stats 4473 libipw_rx_stats
4474 stats = { 4474 stats = {
4475 .len = size - 1, 4475 .len = size - 1,
4476 }; 4476 };
@@ -4478,10 +4478,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4478 IPW_DEBUG_QOS 4478 IPW_DEBUG_QOS
4479 ("QoS Associate " 4479 ("QoS Associate "
4480 "size %d\n", size); 4480 "size %d\n", size);
4481 ieee80211_rx_mgt(priv-> 4481 libipw_rx_mgt(priv->
4482 ieee, 4482 ieee,
4483 (struct 4483 (struct
4484 ieee80211_hdr_4addr 4484 libipw_hdr_4addr
4485 *) 4485 *)
4486 &notif->u.raw, &stats); 4486 &notif->u.raw, &stats);
4487 } 4487 }
@@ -4537,11 +4537,11 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4537 case CMAS_INIT:{ 4537 case CMAS_INIT:{
4538 if (priv->status & STATUS_AUTH) { 4538 if (priv->status & STATUS_AUTH) {
4539 struct 4539 struct
4540 ieee80211_assoc_response 4540 libipw_assoc_response
4541 *resp; 4541 *resp;
4542 resp = 4542 resp =
4543 (struct 4543 (struct
4544 ieee80211_assoc_response 4544 libipw_assoc_response
4545 *)&notif->u.raw; 4545 *)&notif->u.raw;
4546 IPW_DEBUG(IPW_DL_NOTIF | 4546 IPW_DEBUG(IPW_DL_NOTIF |
4547 IPW_DL_STATE | 4547 IPW_DL_STATE |
@@ -5227,33 +5227,33 @@ static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *priv)
5227 5227
5228static int ipw_is_rate_in_mask(struct ipw_priv *priv, int ieee_mode, u8 rate) 5228static int ipw_is_rate_in_mask(struct ipw_priv *priv, int ieee_mode, u8 rate)
5229{ 5229{
5230 rate &= ~IEEE80211_BASIC_RATE_MASK; 5230 rate &= ~LIBIPW_BASIC_RATE_MASK;
5231 if (ieee_mode == IEEE_A) { 5231 if (ieee_mode == IEEE_A) {
5232 switch (rate) { 5232 switch (rate) {
5233 case IEEE80211_OFDM_RATE_6MB: 5233 case LIBIPW_OFDM_RATE_6MB:
5234 return priv->rates_mask & IEEE80211_OFDM_RATE_6MB_MASK ? 5234 return priv->rates_mask & LIBIPW_OFDM_RATE_6MB_MASK ?
5235 1 : 0; 5235 1 : 0;
5236 case IEEE80211_OFDM_RATE_9MB: 5236 case LIBIPW_OFDM_RATE_9MB:
5237 return priv->rates_mask & IEEE80211_OFDM_RATE_9MB_MASK ? 5237 return priv->rates_mask & LIBIPW_OFDM_RATE_9MB_MASK ?
5238 1 : 0; 5238 1 : 0;
5239 case IEEE80211_OFDM_RATE_12MB: 5239 case LIBIPW_OFDM_RATE_12MB:
5240 return priv-> 5240 return priv->
5241 rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ? 1 : 0; 5241 rates_mask & LIBIPW_OFDM_RATE_12MB_MASK ? 1 : 0;
5242 case IEEE80211_OFDM_RATE_18MB: 5242 case LIBIPW_OFDM_RATE_18MB:
5243 return priv-> 5243 return priv->
5244 rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ? 1 : 0; 5244 rates_mask & LIBIPW_OFDM_RATE_18MB_MASK ? 1 : 0;
5245 case IEEE80211_OFDM_RATE_24MB: 5245 case LIBIPW_OFDM_RATE_24MB:
5246 return priv-> 5246 return priv->
5247 rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ? 1 : 0; 5247 rates_mask & LIBIPW_OFDM_RATE_24MB_MASK ? 1 : 0;
5248 case IEEE80211_OFDM_RATE_36MB: 5248 case LIBIPW_OFDM_RATE_36MB:
5249 return priv-> 5249 return priv->
5250 rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ? 1 : 0; 5250 rates_mask & LIBIPW_OFDM_RATE_36MB_MASK ? 1 : 0;
5251 case IEEE80211_OFDM_RATE_48MB: 5251 case LIBIPW_OFDM_RATE_48MB:
5252 return priv-> 5252 return priv->
5253 rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ? 1 : 0; 5253 rates_mask & LIBIPW_OFDM_RATE_48MB_MASK ? 1 : 0;
5254 case IEEE80211_OFDM_RATE_54MB: 5254 case LIBIPW_OFDM_RATE_54MB:
5255 return priv-> 5255 return priv->
5256 rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ? 1 : 0; 5256 rates_mask & LIBIPW_OFDM_RATE_54MB_MASK ? 1 : 0;
5257 default: 5257 default:
5258 return 0; 5258 return 0;
5259 } 5259 }
@@ -5261,14 +5261,14 @@ static int ipw_is_rate_in_mask(struct ipw_priv *priv, int ieee_mode, u8 rate)
5261 5261
5262 /* B and G mixed */ 5262 /* B and G mixed */
5263 switch (rate) { 5263 switch (rate) {
5264 case IEEE80211_CCK_RATE_1MB: 5264 case LIBIPW_CCK_RATE_1MB:
5265 return priv->rates_mask & IEEE80211_CCK_RATE_1MB_MASK ? 1 : 0; 5265 return priv->rates_mask & LIBIPW_CCK_RATE_1MB_MASK ? 1 : 0;
5266 case IEEE80211_CCK_RATE_2MB: 5266 case LIBIPW_CCK_RATE_2MB:
5267 return priv->rates_mask & IEEE80211_CCK_RATE_2MB_MASK ? 1 : 0; 5267 return priv->rates_mask & LIBIPW_CCK_RATE_2MB_MASK ? 1 : 0;
5268 case IEEE80211_CCK_RATE_5MB: 5268 case LIBIPW_CCK_RATE_5MB:
5269 return priv->rates_mask & IEEE80211_CCK_RATE_5MB_MASK ? 1 : 0; 5269 return priv->rates_mask & LIBIPW_CCK_RATE_5MB_MASK ? 1 : 0;
5270 case IEEE80211_CCK_RATE_11MB: 5270 case LIBIPW_CCK_RATE_11MB:
5271 return priv->rates_mask & IEEE80211_CCK_RATE_11MB_MASK ? 1 : 0; 5271 return priv->rates_mask & LIBIPW_CCK_RATE_11MB_MASK ? 1 : 0;
5272 } 5272 }
5273 5273
5274 /* If we are limited to B modulations, bail at this point */ 5274 /* If we are limited to B modulations, bail at this point */
@@ -5277,29 +5277,29 @@ static int ipw_is_rate_in_mask(struct ipw_priv *priv, int ieee_mode, u8 rate)
5277 5277
5278 /* G */ 5278 /* G */
5279 switch (rate) { 5279 switch (rate) {
5280 case IEEE80211_OFDM_RATE_6MB: 5280 case LIBIPW_OFDM_RATE_6MB:
5281 return priv->rates_mask & IEEE80211_OFDM_RATE_6MB_MASK ? 1 : 0; 5281 return priv->rates_mask & LIBIPW_OFDM_RATE_6MB_MASK ? 1 : 0;
5282 case IEEE80211_OFDM_RATE_9MB: 5282 case LIBIPW_OFDM_RATE_9MB:
5283 return priv->rates_mask & IEEE80211_OFDM_RATE_9MB_MASK ? 1 : 0; 5283 return priv->rates_mask & LIBIPW_OFDM_RATE_9MB_MASK ? 1 : 0;
5284 case IEEE80211_OFDM_RATE_12MB: 5284 case LIBIPW_OFDM_RATE_12MB:
5285 return priv->rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ? 1 : 0; 5285 return priv->rates_mask & LIBIPW_OFDM_RATE_12MB_MASK ? 1 : 0;
5286 case IEEE80211_OFDM_RATE_18MB: 5286 case LIBIPW_OFDM_RATE_18MB:
5287 return priv->rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ? 1 : 0; 5287 return priv->rates_mask & LIBIPW_OFDM_RATE_18MB_MASK ? 1 : 0;
5288 case IEEE80211_OFDM_RATE_24MB: 5288 case LIBIPW_OFDM_RATE_24MB:
5289 return priv->rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ? 1 : 0; 5289 return priv->rates_mask & LIBIPW_OFDM_RATE_24MB_MASK ? 1 : 0;
5290 case IEEE80211_OFDM_RATE_36MB: 5290 case LIBIPW_OFDM_RATE_36MB:
5291 return priv->rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ? 1 : 0; 5291 return priv->rates_mask & LIBIPW_OFDM_RATE_36MB_MASK ? 1 : 0;
5292 case IEEE80211_OFDM_RATE_48MB: 5292 case LIBIPW_OFDM_RATE_48MB:
5293 return priv->rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ? 1 : 0; 5293 return priv->rates_mask & LIBIPW_OFDM_RATE_48MB_MASK ? 1 : 0;
5294 case IEEE80211_OFDM_RATE_54MB: 5294 case LIBIPW_OFDM_RATE_54MB:
5295 return priv->rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ? 1 : 0; 5295 return priv->rates_mask & LIBIPW_OFDM_RATE_54MB_MASK ? 1 : 0;
5296 } 5296 }
5297 5297
5298 return 0; 5298 return 0;
5299} 5299}
5300 5300
5301static int ipw_compatible_rates(struct ipw_priv *priv, 5301static int ipw_compatible_rates(struct ipw_priv *priv,
5302 const struct ieee80211_network *network, 5302 const struct libipw_network *network,
5303 struct ipw_supported_rates *rates) 5303 struct ipw_supported_rates *rates)
5304{ 5304{
5305 int num_rates, i; 5305 int num_rates, i;
@@ -5311,7 +5311,7 @@ static int ipw_compatible_rates(struct ipw_priv *priv,
5311 if (!ipw_is_rate_in_mask(priv, network->mode, 5311 if (!ipw_is_rate_in_mask(priv, network->mode,
5312 network->rates[i])) { 5312 network->rates[i])) {
5313 5313
5314 if (network->rates[i] & IEEE80211_BASIC_RATE_MASK) { 5314 if (network->rates[i] & LIBIPW_BASIC_RATE_MASK) {
5315 IPW_DEBUG_SCAN("Adding masked mandatory " 5315 IPW_DEBUG_SCAN("Adding masked mandatory "
5316 "rate %02X\n", 5316 "rate %02X\n",
5317 network->rates[i]); 5317 network->rates[i]);
@@ -5333,7 +5333,7 @@ static int ipw_compatible_rates(struct ipw_priv *priv,
5333 for (i = 0; i < num_rates; i++) { 5333 for (i = 0; i < num_rates; i++) {
5334 if (!ipw_is_rate_in_mask(priv, network->mode, 5334 if (!ipw_is_rate_in_mask(priv, network->mode,
5335 network->rates_ex[i])) { 5335 network->rates_ex[i])) {
5336 if (network->rates_ex[i] & IEEE80211_BASIC_RATE_MASK) { 5336 if (network->rates_ex[i] & LIBIPW_BASIC_RATE_MASK) {
5337 IPW_DEBUG_SCAN("Adding masked mandatory " 5337 IPW_DEBUG_SCAN("Adding masked mandatory "
5338 "rate %02X\n", 5338 "rate %02X\n",
5339 network->rates_ex[i]); 5339 network->rates_ex[i]);
@@ -5369,73 +5369,73 @@ static void ipw_copy_rates(struct ipw_supported_rates *dest,
5369static void ipw_add_cck_scan_rates(struct ipw_supported_rates *rates, 5369static void ipw_add_cck_scan_rates(struct ipw_supported_rates *rates,
5370 u8 modulation, u32 rate_mask) 5370 u8 modulation, u32 rate_mask)
5371{ 5371{
5372 u8 basic_mask = (IEEE80211_OFDM_MODULATION == modulation) ? 5372 u8 basic_mask = (LIBIPW_OFDM_MODULATION == modulation) ?
5373 IEEE80211_BASIC_RATE_MASK : 0; 5373 LIBIPW_BASIC_RATE_MASK : 0;
5374 5374
5375 if (rate_mask & IEEE80211_CCK_RATE_1MB_MASK) 5375 if (rate_mask & LIBIPW_CCK_RATE_1MB_MASK)
5376 rates->supported_rates[rates->num_rates++] = 5376 rates->supported_rates[rates->num_rates++] =
5377 IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_1MB; 5377 LIBIPW_BASIC_RATE_MASK | LIBIPW_CCK_RATE_1MB;
5378 5378
5379 if (rate_mask & IEEE80211_CCK_RATE_2MB_MASK) 5379 if (rate_mask & LIBIPW_CCK_RATE_2MB_MASK)
5380 rates->supported_rates[rates->num_rates++] = 5380 rates->supported_rates[rates->num_rates++] =
5381 IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB; 5381 LIBIPW_BASIC_RATE_MASK | LIBIPW_CCK_RATE_2MB;
5382 5382
5383 if (rate_mask & IEEE80211_CCK_RATE_5MB_MASK) 5383 if (rate_mask & LIBIPW_CCK_RATE_5MB_MASK)
5384 rates->supported_rates[rates->num_rates++] = basic_mask | 5384 rates->supported_rates[rates->num_rates++] = basic_mask |
5385 IEEE80211_CCK_RATE_5MB; 5385 LIBIPW_CCK_RATE_5MB;
5386 5386
5387 if (rate_mask & IEEE80211_CCK_RATE_11MB_MASK) 5387 if (rate_mask & LIBIPW_CCK_RATE_11MB_MASK)
5388 rates->supported_rates[rates->num_rates++] = basic_mask | 5388 rates->supported_rates[rates->num_rates++] = basic_mask |
5389 IEEE80211_CCK_RATE_11MB; 5389 LIBIPW_CCK_RATE_11MB;
5390} 5390}
5391 5391
5392static void ipw_add_ofdm_scan_rates(struct ipw_supported_rates *rates, 5392static void ipw_add_ofdm_scan_rates(struct ipw_supported_rates *rates,
5393 u8 modulation, u32 rate_mask) 5393 u8 modulation, u32 rate_mask)
5394{ 5394{
5395 u8 basic_mask = (IEEE80211_OFDM_MODULATION == modulation) ? 5395 u8 basic_mask = (LIBIPW_OFDM_MODULATION == modulation) ?
5396 IEEE80211_BASIC_RATE_MASK : 0; 5396 LIBIPW_BASIC_RATE_MASK : 0;
5397 5397
5398 if (rate_mask & IEEE80211_OFDM_RATE_6MB_MASK) 5398 if (rate_mask & LIBIPW_OFDM_RATE_6MB_MASK)
5399 rates->supported_rates[rates->num_rates++] = basic_mask | 5399 rates->supported_rates[rates->num_rates++] = basic_mask |
5400 IEEE80211_OFDM_RATE_6MB; 5400 LIBIPW_OFDM_RATE_6MB;
5401 5401
5402 if (rate_mask & IEEE80211_OFDM_RATE_9MB_MASK) 5402 if (rate_mask & LIBIPW_OFDM_RATE_9MB_MASK)
5403 rates->supported_rates[rates->num_rates++] = 5403 rates->supported_rates[rates->num_rates++] =
5404 IEEE80211_OFDM_RATE_9MB; 5404 LIBIPW_OFDM_RATE_9MB;
5405 5405
5406 if (rate_mask & IEEE80211_OFDM_RATE_12MB_MASK) 5406 if (rate_mask & LIBIPW_OFDM_RATE_12MB_MASK)
5407 rates->supported_rates[rates->num_rates++] = basic_mask | 5407 rates->supported_rates[rates->num_rates++] = basic_mask |
5408 IEEE80211_OFDM_RATE_12MB; 5408 LIBIPW_OFDM_RATE_12MB;
5409 5409
5410 if (rate_mask & IEEE80211_OFDM_RATE_18MB_MASK) 5410 if (rate_mask & LIBIPW_OFDM_RATE_18MB_MASK)
5411 rates->supported_rates[rates->num_rates++] = 5411 rates->supported_rates[rates->num_rates++] =
5412 IEEE80211_OFDM_RATE_18MB; 5412 LIBIPW_OFDM_RATE_18MB;
5413 5413
5414 if (rate_mask & IEEE80211_OFDM_RATE_24MB_MASK) 5414 if (rate_mask & LIBIPW_OFDM_RATE_24MB_MASK)
5415 rates->supported_rates[rates->num_rates++] = basic_mask | 5415 rates->supported_rates[rates->num_rates++] = basic_mask |
5416 IEEE80211_OFDM_RATE_24MB; 5416 LIBIPW_OFDM_RATE_24MB;
5417 5417
5418 if (rate_mask & IEEE80211_OFDM_RATE_36MB_MASK) 5418 if (rate_mask & LIBIPW_OFDM_RATE_36MB_MASK)
5419 rates->supported_rates[rates->num_rates++] = 5419 rates->supported_rates[rates->num_rates++] =
5420 IEEE80211_OFDM_RATE_36MB; 5420 LIBIPW_OFDM_RATE_36MB;
5421 5421
5422 if (rate_mask & IEEE80211_OFDM_RATE_48MB_MASK) 5422 if (rate_mask & LIBIPW_OFDM_RATE_48MB_MASK)
5423 rates->supported_rates[rates->num_rates++] = 5423 rates->supported_rates[rates->num_rates++] =
5424 IEEE80211_OFDM_RATE_48MB; 5424 LIBIPW_OFDM_RATE_48MB;
5425 5425
5426 if (rate_mask & IEEE80211_OFDM_RATE_54MB_MASK) 5426 if (rate_mask & LIBIPW_OFDM_RATE_54MB_MASK)
5427 rates->supported_rates[rates->num_rates++] = 5427 rates->supported_rates[rates->num_rates++] =
5428 IEEE80211_OFDM_RATE_54MB; 5428 LIBIPW_OFDM_RATE_54MB;
5429} 5429}
5430 5430
5431struct ipw_network_match { 5431struct ipw_network_match {
5432 struct ieee80211_network *network; 5432 struct libipw_network *network;
5433 struct ipw_supported_rates rates; 5433 struct ipw_supported_rates rates;
5434}; 5434};
5435 5435
5436static int ipw_find_adhoc_network(struct ipw_priv *priv, 5436static int ipw_find_adhoc_network(struct ipw_priv *priv,
5437 struct ipw_network_match *match, 5437 struct ipw_network_match *match,
5438 struct ieee80211_network *network, 5438 struct libipw_network *network,
5439 int roaming) 5439 int roaming)
5440{ 5440{
5441 struct ipw_supported_rates rates; 5441 struct ipw_supported_rates rates;
@@ -5556,7 +5556,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5556 } 5556 }
5557 5557
5558 /* Filter out any incompatible freq / mode combinations */ 5558 /* Filter out any incompatible freq / mode combinations */
5559 if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) { 5559 if (!libipw_is_valid_mode(priv->ieee, network->mode)) {
5560 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5560 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5561 "because of invalid frequency/mode " 5561 "because of invalid frequency/mode "
5562 "combination.\n", 5562 "combination.\n",
@@ -5606,7 +5606,7 @@ static void ipw_merge_adhoc_network(struct work_struct *work)
5606 DECLARE_SSID_BUF(ssid); 5606 DECLARE_SSID_BUF(ssid);
5607 struct ipw_priv *priv = 5607 struct ipw_priv *priv =
5608 container_of(work, struct ipw_priv, merge_networks); 5608 container_of(work, struct ipw_priv, merge_networks);
5609 struct ieee80211_network *network = NULL; 5609 struct libipw_network *network = NULL;
5610 struct ipw_network_match match = { 5610 struct ipw_network_match match = {
5611 .network = priv->assoc_network 5611 .network = priv->assoc_network
5612 }; 5612 };
@@ -5648,7 +5648,7 @@ static void ipw_merge_adhoc_network(struct work_struct *work)
5648 5648
5649static int ipw_best_network(struct ipw_priv *priv, 5649static int ipw_best_network(struct ipw_priv *priv,
5650 struct ipw_network_match *match, 5650 struct ipw_network_match *match,
5651 struct ieee80211_network *network, int roaming) 5651 struct libipw_network *network, int roaming)
5652{ 5652{
5653 struct ipw_supported_rates rates; 5653 struct ipw_supported_rates rates;
5654 DECLARE_SSID_BUF(ssid); 5654 DECLARE_SSID_BUF(ssid);
@@ -5782,7 +5782,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5782 } 5782 }
5783 5783
5784 /* Filter out any incompatible freq / mode combinations */ 5784 /* Filter out any incompatible freq / mode combinations */
5785 if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) { 5785 if (!libipw_is_valid_mode(priv->ieee, network->mode)) {
5786 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5786 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5787 "because of invalid frequency/mode " 5787 "because of invalid frequency/mode "
5788 "combination.\n", 5788 "combination.\n",
@@ -5793,7 +5793,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5793 } 5793 }
5794 5794
5795 /* Filter out invalid channel in current GEO */ 5795 /* Filter out invalid channel in current GEO */
5796 if (!ieee80211_is_valid_channel(priv->ieee, network->channel)) { 5796 if (!libipw_is_valid_channel(priv->ieee, network->channel)) {
5797 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5797 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5798 "because of invalid channel in current GEO\n", 5798 "because of invalid channel in current GEO\n",
5799 print_ssid(ssid, network->ssid, 5799 print_ssid(ssid, network->ssid,
@@ -5839,9 +5839,9 @@ static int ipw_best_network(struct ipw_priv *priv,
5839} 5839}
5840 5840
5841static void ipw_adhoc_create(struct ipw_priv *priv, 5841static void ipw_adhoc_create(struct ipw_priv *priv,
5842 struct ieee80211_network *network) 5842 struct libipw_network *network)
5843{ 5843{
5844 const struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee); 5844 const struct libipw_geo *geo = libipw_get_geo(priv->ieee);
5845 int i; 5845 int i;
5846 5846
5847 /* 5847 /*
@@ -5856,25 +5856,25 @@ static void ipw_adhoc_create(struct ipw_priv *priv,
5856 * FW fatal error. 5856 * FW fatal error.
5857 * 5857 *
5858 */ 5858 */
5859 switch (ieee80211_is_valid_channel(priv->ieee, priv->channel)) { 5859 switch (libipw_is_valid_channel(priv->ieee, priv->channel)) {
5860 case IEEE80211_52GHZ_BAND: 5860 case LIBIPW_52GHZ_BAND:
5861 network->mode = IEEE_A; 5861 network->mode = IEEE_A;
5862 i = ieee80211_channel_to_index(priv->ieee, priv->channel); 5862 i = libipw_channel_to_index(priv->ieee, priv->channel);
5863 BUG_ON(i == -1); 5863 BUG_ON(i == -1);
5864 if (geo->a[i].flags & IEEE80211_CH_PASSIVE_ONLY) { 5864 if (geo->a[i].flags & LIBIPW_CH_PASSIVE_ONLY) {
5865 IPW_WARNING("Overriding invalid channel\n"); 5865 IPW_WARNING("Overriding invalid channel\n");
5866 priv->channel = geo->a[0].channel; 5866 priv->channel = geo->a[0].channel;
5867 } 5867 }
5868 break; 5868 break;
5869 5869
5870 case IEEE80211_24GHZ_BAND: 5870 case LIBIPW_24GHZ_BAND:
5871 if (priv->ieee->mode & IEEE_G) 5871 if (priv->ieee->mode & IEEE_G)
5872 network->mode = IEEE_G; 5872 network->mode = IEEE_G;
5873 else 5873 else
5874 network->mode = IEEE_B; 5874 network->mode = IEEE_B;
5875 i = ieee80211_channel_to_index(priv->ieee, priv->channel); 5875 i = libipw_channel_to_index(priv->ieee, priv->channel);
5876 BUG_ON(i == -1); 5876 BUG_ON(i == -1);
5877 if (geo->bg[i].flags & IEEE80211_CH_PASSIVE_ONLY) { 5877 if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY) {
5878 IPW_WARNING("Overriding invalid channel\n"); 5878 IPW_WARNING("Overriding invalid channel\n");
5879 priv->channel = geo->bg[0].channel; 5879 priv->channel = geo->bg[0].channel;
5880 } 5880 }
@@ -6110,9 +6110,9 @@ static void ipw_set_fixed_rate(struct ipw_priv *priv, int mode)
6110 * Tx rates */ 6110 * Tx rates */
6111 6111
6112 switch (priv->ieee->freq_band) { 6112 switch (priv->ieee->freq_band) {
6113 case IEEE80211_52GHZ_BAND: /* A only */ 6113 case LIBIPW_52GHZ_BAND: /* A only */
6114 /* IEEE_A */ 6114 /* IEEE_A */
6115 if (priv->rates_mask & ~IEEE80211_OFDM_RATES_MASK) { 6115 if (priv->rates_mask & ~LIBIPW_OFDM_RATES_MASK) {
6116 /* Invalid fixed rate mask */ 6116 /* Invalid fixed rate mask */
6117 IPW_DEBUG_WX 6117 IPW_DEBUG_WX
6118 ("invalid fixed rate mask in ipw_set_fixed_rate\n"); 6118 ("invalid fixed rate mask in ipw_set_fixed_rate\n");
@@ -6120,13 +6120,13 @@ static void ipw_set_fixed_rate(struct ipw_priv *priv, int mode)
6120 break; 6120 break;
6121 } 6121 }
6122 6122
6123 new_tx_rates >>= IEEE80211_OFDM_SHIFT_MASK_A; 6123 new_tx_rates >>= LIBIPW_OFDM_SHIFT_MASK_A;
6124 break; 6124 break;
6125 6125
6126 default: /* 2.4Ghz or Mixed */ 6126 default: /* 2.4Ghz or Mixed */
6127 /* IEEE_B */ 6127 /* IEEE_B */
6128 if (mode == IEEE_B) { 6128 if (mode == IEEE_B) {
6129 if (new_tx_rates & ~IEEE80211_CCK_RATES_MASK) { 6129 if (new_tx_rates & ~LIBIPW_CCK_RATES_MASK) {
6130 /* Invalid fixed rate mask */ 6130 /* Invalid fixed rate mask */
6131 IPW_DEBUG_WX 6131 IPW_DEBUG_WX
6132 ("invalid fixed rate mask in ipw_set_fixed_rate\n"); 6132 ("invalid fixed rate mask in ipw_set_fixed_rate\n");
@@ -6136,8 +6136,8 @@ static void ipw_set_fixed_rate(struct ipw_priv *priv, int mode)
6136 } 6136 }
6137 6137
6138 /* IEEE_G */ 6138 /* IEEE_G */
6139 if (new_tx_rates & ~(IEEE80211_CCK_RATES_MASK | 6139 if (new_tx_rates & ~(LIBIPW_CCK_RATES_MASK |
6140 IEEE80211_OFDM_RATES_MASK)) { 6140 LIBIPW_OFDM_RATES_MASK)) {
6141 /* Invalid fixed rate mask */ 6141 /* Invalid fixed rate mask */
6142 IPW_DEBUG_WX 6142 IPW_DEBUG_WX
6143 ("invalid fixed rate mask in ipw_set_fixed_rate\n"); 6143 ("invalid fixed rate mask in ipw_set_fixed_rate\n");
@@ -6145,19 +6145,19 @@ static void ipw_set_fixed_rate(struct ipw_priv *priv, int mode)
6145 break; 6145 break;
6146 } 6146 }
6147 6147
6148 if (IEEE80211_OFDM_RATE_6MB_MASK & new_tx_rates) { 6148 if (LIBIPW_OFDM_RATE_6MB_MASK & new_tx_rates) {
6149 mask |= (IEEE80211_OFDM_RATE_6MB_MASK >> 1); 6149 mask |= (LIBIPW_OFDM_RATE_6MB_MASK >> 1);
6150 new_tx_rates &= ~IEEE80211_OFDM_RATE_6MB_MASK; 6150 new_tx_rates &= ~LIBIPW_OFDM_RATE_6MB_MASK;
6151 } 6151 }
6152 6152
6153 if (IEEE80211_OFDM_RATE_9MB_MASK & new_tx_rates) { 6153 if (LIBIPW_OFDM_RATE_9MB_MASK & new_tx_rates) {
6154 mask |= (IEEE80211_OFDM_RATE_9MB_MASK >> 1); 6154 mask |= (LIBIPW_OFDM_RATE_9MB_MASK >> 1);
6155 new_tx_rates &= ~IEEE80211_OFDM_RATE_9MB_MASK; 6155 new_tx_rates &= ~LIBIPW_OFDM_RATE_9MB_MASK;
6156 } 6156 }
6157 6157
6158 if (IEEE80211_OFDM_RATE_12MB_MASK & new_tx_rates) { 6158 if (LIBIPW_OFDM_RATE_12MB_MASK & new_tx_rates) {
6159 mask |= (IEEE80211_OFDM_RATE_12MB_MASK >> 1); 6159 mask |= (LIBIPW_OFDM_RATE_12MB_MASK >> 1);
6160 new_tx_rates &= ~IEEE80211_OFDM_RATE_12MB_MASK; 6160 new_tx_rates &= ~LIBIPW_OFDM_RATE_12MB_MASK;
6161 } 6161 }
6162 6162
6163 new_tx_rates |= mask; 6163 new_tx_rates |= mask;
@@ -6190,12 +6190,12 @@ static void ipw_add_scan_channels(struct ipw_priv *priv,
6190 int scan_type) 6190 int scan_type)
6191{ 6191{
6192 int channel_index = 0; 6192 int channel_index = 0;
6193 const struct ieee80211_geo *geo; 6193 const struct libipw_geo *geo;
6194 int i; 6194 int i;
6195 6195
6196 geo = ieee80211_get_geo(priv->ieee); 6196 geo = libipw_get_geo(priv->ieee);
6197 6197
6198 if (priv->ieee->freq_band & IEEE80211_52GHZ_BAND) { 6198 if (priv->ieee->freq_band & LIBIPW_52GHZ_BAND) {
6199 int start = channel_index; 6199 int start = channel_index;
6200 for (i = 0; i < geo->a_channels; i++) { 6200 for (i = 0; i < geo->a_channels; i++) {
6201 if ((priv->status & STATUS_ASSOCIATED) && 6201 if ((priv->status & STATUS_ASSOCIATED) &&
@@ -6205,7 +6205,7 @@ static void ipw_add_scan_channels(struct ipw_priv *priv,
6205 scan->channels_list[channel_index] = geo->a[i].channel; 6205 scan->channels_list[channel_index] = geo->a[i].channel;
6206 ipw_set_scan_type(scan, channel_index, 6206 ipw_set_scan_type(scan, channel_index,
6207 geo->a[i]. 6207 geo->a[i].
6208 flags & IEEE80211_CH_PASSIVE_ONLY ? 6208 flags & LIBIPW_CH_PASSIVE_ONLY ?
6209 IPW_SCAN_PASSIVE_FULL_DWELL_SCAN : 6209 IPW_SCAN_PASSIVE_FULL_DWELL_SCAN :
6210 scan_type); 6210 scan_type);
6211 } 6211 }
@@ -6217,11 +6217,11 @@ static void ipw_add_scan_channels(struct ipw_priv *priv,
6217 } 6217 }
6218 } 6218 }
6219 6219
6220 if (priv->ieee->freq_band & IEEE80211_24GHZ_BAND) { 6220 if (priv->ieee->freq_band & LIBIPW_24GHZ_BAND) {
6221 int start = channel_index; 6221 int start = channel_index;
6222 if (priv->config & CFG_SPEED_SCAN) { 6222 if (priv->config & CFG_SPEED_SCAN) {
6223 int index; 6223 int index;
6224 u8 channels[IEEE80211_24GHZ_CHANNELS] = { 6224 u8 channels[LIBIPW_24GHZ_CHANNELS] = {
6225 /* nop out the list */ 6225 /* nop out the list */
6226 [0] = 0 6226 [0] = 0
6227 }; 6227 };
@@ -6253,11 +6253,11 @@ static void ipw_add_scan_channels(struct ipw_priv *priv,
6253 channel_index++; 6253 channel_index++;
6254 scan->channels_list[channel_index] = channel; 6254 scan->channels_list[channel_index] = channel;
6255 index = 6255 index =
6256 ieee80211_channel_to_index(priv->ieee, channel); 6256 libipw_channel_to_index(priv->ieee, channel);
6257 ipw_set_scan_type(scan, channel_index, 6257 ipw_set_scan_type(scan, channel_index,
6258 geo->bg[index]. 6258 geo->bg[index].
6259 flags & 6259 flags &
6260 IEEE80211_CH_PASSIVE_ONLY ? 6260 LIBIPW_CH_PASSIVE_ONLY ?
6261 IPW_SCAN_PASSIVE_FULL_DWELL_SCAN 6261 IPW_SCAN_PASSIVE_FULL_DWELL_SCAN
6262 : scan_type); 6262 : scan_type);
6263 } 6263 }
@@ -6272,7 +6272,7 @@ static void ipw_add_scan_channels(struct ipw_priv *priv,
6272 ipw_set_scan_type(scan, channel_index, 6272 ipw_set_scan_type(scan, channel_index,
6273 geo->bg[i]. 6273 geo->bg[i].
6274 flags & 6274 flags &
6275 IEEE80211_CH_PASSIVE_ONLY ? 6275 LIBIPW_CH_PASSIVE_ONLY ?
6276 IPW_SCAN_PASSIVE_FULL_DWELL_SCAN 6276 IPW_SCAN_PASSIVE_FULL_DWELL_SCAN
6277 : scan_type); 6277 : scan_type);
6278 } 6278 }
@@ -6339,7 +6339,7 @@ static int ipw_request_scan_helper(struct ipw_priv *priv, int type, int direct)
6339 } 6339 }
6340 6340
6341 memset(&scan, 0, sizeof(scan)); 6341 memset(&scan, 0, sizeof(scan));
6342 scan.full_scan_index = cpu_to_le32(ieee80211_get_scans(priv->ieee)); 6342 scan.full_scan_index = cpu_to_le32(libipw_get_scans(priv->ieee));
6343 6343
6344 if (type == IW_SCAN_TYPE_PASSIVE) { 6344 if (type == IW_SCAN_TYPE_PASSIVE) {
6345 IPW_DEBUG_WX("use passive scanning\n"); 6345 IPW_DEBUG_WX("use passive scanning\n");
@@ -6370,13 +6370,13 @@ static int ipw_request_scan_helper(struct ipw_priv *priv, int type, int direct)
6370 u8 channel; 6370 u8 channel;
6371 u8 band = 0; 6371 u8 band = 0;
6372 6372
6373 switch (ieee80211_is_valid_channel(priv->ieee, priv->channel)) { 6373 switch (libipw_is_valid_channel(priv->ieee, priv->channel)) {
6374 case IEEE80211_52GHZ_BAND: 6374 case LIBIPW_52GHZ_BAND:
6375 band = (u8) (IPW_A_MODE << 6) | 1; 6375 band = (u8) (IPW_A_MODE << 6) | 1;
6376 channel = priv->channel; 6376 channel = priv->channel;
6377 break; 6377 break;
6378 6378
6379 case IEEE80211_24GHZ_BAND: 6379 case LIBIPW_24GHZ_BAND:
6380 band = (u8) (IPW_B_MODE << 6) | 1; 6380 band = (u8) (IPW_B_MODE << 6) | 1;
6381 channel = priv->channel; 6381 channel = priv->channel;
6382 break; 6382 break;
@@ -6497,8 +6497,8 @@ static int ipw_wpa_enable(struct ipw_priv *priv, int value)
6497 6497
6498static int ipw_wpa_set_auth_algs(struct ipw_priv *priv, int value) 6498static int ipw_wpa_set_auth_algs(struct ipw_priv *priv, int value)
6499{ 6499{
6500 struct ieee80211_device *ieee = priv->ieee; 6500 struct libipw_device *ieee = priv->ieee;
6501 struct ieee80211_security sec = { 6501 struct libipw_security sec = {
6502 .flags = SEC_AUTH_MODE, 6502 .flags = SEC_AUTH_MODE,
6503 }; 6503 };
6504 int ret = 0; 6504 int ret = 0;
@@ -6548,8 +6548,8 @@ static int ipw_wx_set_genie(struct net_device *dev,
6548 struct iw_request_info *info, 6548 struct iw_request_info *info,
6549 union iwreq_data *wrqu, char *extra) 6549 union iwreq_data *wrqu, char *extra)
6550{ 6550{
6551 struct ipw_priv *priv = ieee80211_priv(dev); 6551 struct ipw_priv *priv = libipw_priv(dev);
6552 struct ieee80211_device *ieee = priv->ieee; 6552 struct libipw_device *ieee = priv->ieee;
6553 u8 *buf; 6553 u8 *buf;
6554 int err = 0; 6554 int err = 0;
6555 6555
@@ -6584,8 +6584,8 @@ static int ipw_wx_get_genie(struct net_device *dev,
6584 struct iw_request_info *info, 6584 struct iw_request_info *info,
6585 union iwreq_data *wrqu, char *extra) 6585 union iwreq_data *wrqu, char *extra)
6586{ 6586{
6587 struct ipw_priv *priv = ieee80211_priv(dev); 6587 struct ipw_priv *priv = libipw_priv(dev);
6588 struct ieee80211_device *ieee = priv->ieee; 6588 struct libipw_device *ieee = priv->ieee;
6589 int err = 0; 6589 int err = 0;
6590 6590
6591 if (ieee->wpa_ie_len == 0 || ieee->wpa_ie == NULL) { 6591 if (ieee->wpa_ie_len == 0 || ieee->wpa_ie == NULL) {
@@ -6627,8 +6627,8 @@ static int ipw_wx_set_auth(struct net_device *dev,
6627 struct iw_request_info *info, 6627 struct iw_request_info *info,
6628 union iwreq_data *wrqu, char *extra) 6628 union iwreq_data *wrqu, char *extra)
6629{ 6629{
6630 struct ipw_priv *priv = ieee80211_priv(dev); 6630 struct ipw_priv *priv = libipw_priv(dev);
6631 struct ieee80211_device *ieee = priv->ieee; 6631 struct libipw_device *ieee = priv->ieee;
6632 struct iw_param *param = &wrqu->param; 6632 struct iw_param *param = &wrqu->param;
6633 struct lib80211_crypt_data *crypt; 6633 struct lib80211_crypt_data *crypt;
6634 unsigned long flags; 6634 unsigned long flags;
@@ -6679,7 +6679,7 @@ static int ipw_wx_set_auth(struct net_device *dev,
6679 * can use this to determine if the CAP_PRIVACY_ON bit should 6679 * can use this to determine if the CAP_PRIVACY_ON bit should
6680 * be set. 6680 * be set.
6681 */ 6681 */
6682 struct ieee80211_security sec = { 6682 struct libipw_security sec = {
6683 .flags = SEC_ENABLED, 6683 .flags = SEC_ENABLED,
6684 .enabled = param->value, 6684 .enabled = param->value,
6685 }; 6685 };
@@ -6727,8 +6727,8 @@ static int ipw_wx_get_auth(struct net_device *dev,
6727 struct iw_request_info *info, 6727 struct iw_request_info *info,
6728 union iwreq_data *wrqu, char *extra) 6728 union iwreq_data *wrqu, char *extra)
6729{ 6729{
6730 struct ipw_priv *priv = ieee80211_priv(dev); 6730 struct ipw_priv *priv = libipw_priv(dev);
6731 struct ieee80211_device *ieee = priv->ieee; 6731 struct libipw_device *ieee = priv->ieee;
6732 struct lib80211_crypt_data *crypt; 6732 struct lib80211_crypt_data *crypt;
6733 struct iw_param *param = &wrqu->param; 6733 struct iw_param *param = &wrqu->param;
6734 int ret = 0; 6734 int ret = 0;
@@ -6786,7 +6786,7 @@ static int ipw_wx_set_encodeext(struct net_device *dev,
6786 struct iw_request_info *info, 6786 struct iw_request_info *info,
6787 union iwreq_data *wrqu, char *extra) 6787 union iwreq_data *wrqu, char *extra)
6788{ 6788{
6789 struct ipw_priv *priv = ieee80211_priv(dev); 6789 struct ipw_priv *priv = libipw_priv(dev);
6790 struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; 6790 struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
6791 6791
6792 if (hwcrypto) { 6792 if (hwcrypto) {
@@ -6808,7 +6808,7 @@ static int ipw_wx_set_encodeext(struct net_device *dev,
6808 } 6808 }
6809 } 6809 }
6810 6810
6811 return ieee80211_wx_set_encodeext(priv->ieee, info, wrqu, extra); 6811 return libipw_wx_set_encodeext(priv->ieee, info, wrqu, extra);
6812} 6812}
6813 6813
6814/* SIOCGIWENCODEEXT */ 6814/* SIOCGIWENCODEEXT */
@@ -6816,8 +6816,8 @@ static int ipw_wx_get_encodeext(struct net_device *dev,
6816 struct iw_request_info *info, 6816 struct iw_request_info *info,
6817 union iwreq_data *wrqu, char *extra) 6817 union iwreq_data *wrqu, char *extra)
6818{ 6818{
6819 struct ipw_priv *priv = ieee80211_priv(dev); 6819 struct ipw_priv *priv = libipw_priv(dev);
6820 return ieee80211_wx_get_encodeext(priv->ieee, info, wrqu, extra); 6820 return libipw_wx_get_encodeext(priv->ieee, info, wrqu, extra);
6821} 6821}
6822 6822
6823/* SIOCSIWMLME */ 6823/* SIOCSIWMLME */
@@ -6825,7 +6825,7 @@ static int ipw_wx_set_mlme(struct net_device *dev,
6825 struct iw_request_info *info, 6825 struct iw_request_info *info,
6826 union iwreq_data *wrqu, char *extra) 6826 union iwreq_data *wrqu, char *extra)
6827{ 6827{
6828 struct ipw_priv *priv = ieee80211_priv(dev); 6828 struct ipw_priv *priv = libipw_priv(dev);
6829 struct iw_mlme *mlme = (struct iw_mlme *)extra; 6829 struct iw_mlme *mlme = (struct iw_mlme *)extra;
6830 __le16 reason; 6830 __le16 reason;
6831 6831
@@ -6875,9 +6875,9 @@ static u8 ipw_qos_current_mode(struct ipw_priv * priv)
6875*/ 6875*/
6876static int ipw_qos_handle_probe_response(struct ipw_priv *priv, 6876static int ipw_qos_handle_probe_response(struct ipw_priv *priv,
6877 int active_network, 6877 int active_network,
6878 struct ieee80211_network *network) 6878 struct libipw_network *network)
6879{ 6879{
6880 u32 size = sizeof(struct ieee80211_qos_parameters); 6880 u32 size = sizeof(struct libipw_qos_parameters);
6881 6881
6882 if (network->capability & WLAN_CAPABILITY_IBSS) 6882 if (network->capability & WLAN_CAPABILITY_IBSS)
6883 network->qos_data.active = network->qos_data.supported; 6883 network->qos_data.active = network->qos_data.supported;
@@ -6935,12 +6935,12 @@ static int ipw_qos_handle_probe_response(struct ipw_priv *priv,
6935* IPW_CMD_QOS_PARAMETERS and IPW_CMD_WME_INFO 6935* IPW_CMD_QOS_PARAMETERS and IPW_CMD_WME_INFO
6936*/ 6936*/
6937static int ipw_qos_activate(struct ipw_priv *priv, 6937static int ipw_qos_activate(struct ipw_priv *priv,
6938 struct ieee80211_qos_data *qos_network_data) 6938 struct libipw_qos_data *qos_network_data)
6939{ 6939{
6940 int err; 6940 int err;
6941 struct ieee80211_qos_parameters qos_parameters[QOS_QOS_SETS]; 6941 struct libipw_qos_parameters qos_parameters[QOS_QOS_SETS];
6942 struct ieee80211_qos_parameters *active_one = NULL; 6942 struct libipw_qos_parameters *active_one = NULL;
6943 u32 size = sizeof(struct ieee80211_qos_parameters); 6943 u32 size = sizeof(struct libipw_qos_parameters);
6944 u32 burst_duration; 6944 u32 burst_duration;
6945 int i; 6945 int i;
6946 u8 type; 6946 u8 type;
@@ -7001,7 +7001,7 @@ static int ipw_qos_activate(struct ipw_priv *priv,
7001 7001
7002 IPW_DEBUG_QOS("QoS sending IPW_CMD_QOS_PARAMETERS\n"); 7002 IPW_DEBUG_QOS("QoS sending IPW_CMD_QOS_PARAMETERS\n");
7003 err = ipw_send_qos_params_command(priv, 7003 err = ipw_send_qos_params_command(priv,
7004 (struct ieee80211_qos_parameters *) 7004 (struct libipw_qos_parameters *)
7005 &(qos_parameters[0])); 7005 &(qos_parameters[0]));
7006 if (err) 7006 if (err)
7007 IPW_DEBUG_QOS("QoS IPW_CMD_QOS_PARAMETERS failed\n"); 7007 IPW_DEBUG_QOS("QoS IPW_CMD_QOS_PARAMETERS failed\n");
@@ -7015,13 +7015,13 @@ static int ipw_qos_activate(struct ipw_priv *priv,
7015static int ipw_qos_set_info_element(struct ipw_priv *priv) 7015static int ipw_qos_set_info_element(struct ipw_priv *priv)
7016{ 7016{
7017 int ret = 0; 7017 int ret = 0;
7018 struct ieee80211_qos_information_element qos_info; 7018 struct libipw_qos_information_element qos_info;
7019 7019
7020 if (priv == NULL) 7020 if (priv == NULL)
7021 return -1; 7021 return -1;
7022 7022
7023 qos_info.elementID = QOS_ELEMENT_ID; 7023 qos_info.elementID = QOS_ELEMENT_ID;
7024 qos_info.length = sizeof(struct ieee80211_qos_information_element) - 2; 7024 qos_info.length = sizeof(struct libipw_qos_information_element) - 2;
7025 7025
7026 qos_info.version = QOS_VERSION_1; 7026 qos_info.version = QOS_VERSION_1;
7027 qos_info.ac_info = 0; 7027 qos_info.ac_info = 0;
@@ -7041,11 +7041,11 @@ static int ipw_qos_set_info_element(struct ipw_priv *priv)
7041* Set the QoS parameter with the association request structure 7041* Set the QoS parameter with the association request structure
7042*/ 7042*/
7043static int ipw_qos_association(struct ipw_priv *priv, 7043static int ipw_qos_association(struct ipw_priv *priv,
7044 struct ieee80211_network *network) 7044 struct libipw_network *network)
7045{ 7045{
7046 int err = 0; 7046 int err = 0;
7047 struct ieee80211_qos_data *qos_data = NULL; 7047 struct libipw_qos_data *qos_data = NULL;
7048 struct ieee80211_qos_data ibss_data = { 7048 struct libipw_qos_data ibss_data = {
7049 .supported = 1, 7049 .supported = 1,
7050 .active = 1, 7050 .active = 1,
7051 }; 7051 };
@@ -7087,11 +7087,11 @@ static int ipw_qos_association(struct ipw_priv *priv,
7087* setting 7087* setting
7088*/ 7088*/
7089static int ipw_qos_association_resp(struct ipw_priv *priv, 7089static int ipw_qos_association_resp(struct ipw_priv *priv,
7090 struct ieee80211_network *network) 7090 struct libipw_network *network)
7091{ 7091{
7092 int ret = 0; 7092 int ret = 0;
7093 unsigned long flags; 7093 unsigned long flags;
7094 u32 size = sizeof(struct ieee80211_qos_parameters); 7094 u32 size = sizeof(struct libipw_qos_parameters);
7095 int set_qos_param = 0; 7095 int set_qos_param = 0;
7096 7096
7097 if ((priv == NULL) || (network == NULL) || 7097 if ((priv == NULL) || (network == NULL) ||
@@ -7107,7 +7107,7 @@ static int ipw_qos_association_resp(struct ipw_priv *priv,
7107 spin_lock_irqsave(&priv->ieee->lock, flags); 7107 spin_lock_irqsave(&priv->ieee->lock, flags);
7108 if (network->flags & NETWORK_HAS_QOS_PARAMETERS) { 7108 if (network->flags & NETWORK_HAS_QOS_PARAMETERS) {
7109 memcpy(&priv->assoc_network->qos_data, &network->qos_data, 7109 memcpy(&priv->assoc_network->qos_data, &network->qos_data,
7110 sizeof(struct ieee80211_qos_data)); 7110 sizeof(struct libipw_qos_data));
7111 priv->assoc_network->qos_data.active = 1; 7111 priv->assoc_network->qos_data.active = 1;
7112 if ((network->qos_data.old_param_count != 7112 if ((network->qos_data.old_param_count !=
7113 network->qos_data.param_count)) { 7113 network->qos_data.param_count)) {
@@ -7143,7 +7143,7 @@ static u32 ipw_qos_get_burst_duration(struct ipw_priv *priv)
7143 if ((priv == NULL)) 7143 if ((priv == NULL))
7144 return 0; 7144 return 0;
7145 7145
7146 if (!(priv->ieee->modulation & IEEE80211_OFDM_MODULATION)) 7146 if (!(priv->ieee->modulation & LIBIPW_OFDM_MODULATION))
7147 ret = priv->qos_data.burst_duration_CCK; 7147 ret = priv->qos_data.burst_duration_CCK;
7148 else 7148 else
7149 ret = priv->qos_data.burst_duration_OFDM; 7149 ret = priv->qos_data.burst_duration_OFDM;
@@ -7195,8 +7195,8 @@ static int ipw_get_tx_queue_number(struct ipw_priv *priv, u16 priority)
7195static int ipw_is_qos_active(struct net_device *dev, 7195static int ipw_is_qos_active(struct net_device *dev,
7196 struct sk_buff *skb) 7196 struct sk_buff *skb)
7197{ 7197{
7198 struct ipw_priv *priv = ieee80211_priv(dev); 7198 struct ipw_priv *priv = libipw_priv(dev);
7199 struct ieee80211_qos_data *qos_data = NULL; 7199 struct libipw_qos_data *qos_data = NULL;
7200 int active, supported; 7200 int active, supported;
7201 u8 *daddr = skb->data + ETH_ALEN; 7201 u8 *daddr = skb->data + ETH_ALEN;
7202 int unicast = !is_multicast_ether_addr(daddr); 7202 int unicast = !is_multicast_ether_addr(daddr);
@@ -7260,10 +7260,10 @@ static void ipw_bg_qos_activate(struct work_struct *work)
7260} 7260}
7261 7261
7262static int ipw_handle_probe_response(struct net_device *dev, 7262static int ipw_handle_probe_response(struct net_device *dev,
7263 struct ieee80211_probe_response *resp, 7263 struct libipw_probe_response *resp,
7264 struct ieee80211_network *network) 7264 struct libipw_network *network)
7265{ 7265{
7266 struct ipw_priv *priv = ieee80211_priv(dev); 7266 struct ipw_priv *priv = libipw_priv(dev);
7267 int active_network = ((priv->status & STATUS_ASSOCIATED) && 7267 int active_network = ((priv->status & STATUS_ASSOCIATED) &&
7268 (network == priv->assoc_network)); 7268 (network == priv->assoc_network));
7269 7269
@@ -7273,10 +7273,10 @@ static int ipw_handle_probe_response(struct net_device *dev,
7273} 7273}
7274 7274
7275static int ipw_handle_beacon(struct net_device *dev, 7275static int ipw_handle_beacon(struct net_device *dev,
7276 struct ieee80211_beacon *resp, 7276 struct libipw_beacon *resp,
7277 struct ieee80211_network *network) 7277 struct libipw_network *network)
7278{ 7278{
7279 struct ipw_priv *priv = ieee80211_priv(dev); 7279 struct ipw_priv *priv = libipw_priv(dev);
7280 int active_network = ((priv->status & STATUS_ASSOCIATED) && 7280 int active_network = ((priv->status & STATUS_ASSOCIATED) &&
7281 (network == priv->assoc_network)); 7281 (network == priv->assoc_network));
7282 7282
@@ -7286,22 +7286,22 @@ static int ipw_handle_beacon(struct net_device *dev,
7286} 7286}
7287 7287
7288static int ipw_handle_assoc_response(struct net_device *dev, 7288static int ipw_handle_assoc_response(struct net_device *dev,
7289 struct ieee80211_assoc_response *resp, 7289 struct libipw_assoc_response *resp,
7290 struct ieee80211_network *network) 7290 struct libipw_network *network)
7291{ 7291{
7292 struct ipw_priv *priv = ieee80211_priv(dev); 7292 struct ipw_priv *priv = libipw_priv(dev);
7293 ipw_qos_association_resp(priv, network); 7293 ipw_qos_association_resp(priv, network);
7294 return 0; 7294 return 0;
7295} 7295}
7296 7296
7297static int ipw_send_qos_params_command(struct ipw_priv *priv, struct ieee80211_qos_parameters 7297static int ipw_send_qos_params_command(struct ipw_priv *priv, struct libipw_qos_parameters
7298 *qos_param) 7298 *qos_param)
7299{ 7299{
7300 return ipw_send_cmd_pdu(priv, IPW_CMD_QOS_PARAMETERS, 7300 return ipw_send_cmd_pdu(priv, IPW_CMD_QOS_PARAMETERS,
7301 sizeof(*qos_param) * 3, qos_param); 7301 sizeof(*qos_param) * 3, qos_param);
7302} 7302}
7303 7303
7304static int ipw_send_qos_info_command(struct ipw_priv *priv, struct ieee80211_qos_information_element 7304static int ipw_send_qos_info_command(struct ipw_priv *priv, struct libipw_qos_information_element
7305 *qos_param) 7305 *qos_param)
7306{ 7306{
7307 return ipw_send_cmd_pdu(priv, IPW_CMD_WME_INFO, sizeof(*qos_param), 7307 return ipw_send_cmd_pdu(priv, IPW_CMD_WME_INFO, sizeof(*qos_param),
@@ -7311,7 +7311,7 @@ static int ipw_send_qos_info_command(struct ipw_priv *priv, struct ieee80211_qos
7311#endif /* CONFIG_IPW2200_QOS */ 7311#endif /* CONFIG_IPW2200_QOS */
7312 7312
7313static int ipw_associate_network(struct ipw_priv *priv, 7313static int ipw_associate_network(struct ipw_priv *priv,
7314 struct ieee80211_network *network, 7314 struct libipw_network *network,
7315 struct ipw_supported_rates *rates, int roaming) 7315 struct ipw_supported_rates *rates, int roaming)
7316{ 7316{
7317 int err; 7317 int err;
@@ -7493,7 +7493,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
7493static void ipw_roam(void *data) 7493static void ipw_roam(void *data)
7494{ 7494{
7495 struct ipw_priv *priv = data; 7495 struct ipw_priv *priv = data;
7496 struct ieee80211_network *network = NULL; 7496 struct libipw_network *network = NULL;
7497 struct ipw_network_match match = { 7497 struct ipw_network_match match = {
7498 .network = priv->assoc_network 7498 .network = priv->assoc_network
7499 }; 7499 };
@@ -7568,7 +7568,7 @@ static int ipw_associate(void *data)
7568{ 7568{
7569 struct ipw_priv *priv = data; 7569 struct ipw_priv *priv = data;
7570 7570
7571 struct ieee80211_network *network = NULL; 7571 struct libipw_network *network = NULL;
7572 struct ipw_network_match match = { 7572 struct ipw_network_match match = {
7573 .network = NULL 7573 .network = NULL
7574 }; 7574 };
@@ -7622,8 +7622,8 @@ static int ipw_associate(void *data)
7622 priv->config & CFG_STATIC_CHANNEL) { 7622 priv->config & CFG_STATIC_CHANNEL) {
7623 /* Use oldest network if the free list is empty */ 7623 /* Use oldest network if the free list is empty */
7624 if (list_empty(&priv->ieee->network_free_list)) { 7624 if (list_empty(&priv->ieee->network_free_list)) {
7625 struct ieee80211_network *oldest = NULL; 7625 struct libipw_network *oldest = NULL;
7626 struct ieee80211_network *target; 7626 struct libipw_network *target;
7627 7627
7628 list_for_each_entry(target, &priv->ieee->network_list, list) { 7628 list_for_each_entry(target, &priv->ieee->network_list, list) {
7629 if ((oldest == NULL) || 7629 if ((oldest == NULL) ||
@@ -7644,7 +7644,7 @@ static int ipw_associate(void *data)
7644 } 7644 }
7645 7645
7646 element = priv->ieee->network_free_list.next; 7646 element = priv->ieee->network_free_list.next;
7647 network = list_entry(element, struct ieee80211_network, list); 7647 network = list_entry(element, struct libipw_network, list);
7648 ipw_adhoc_create(priv, network); 7648 ipw_adhoc_create(priv, network);
7649 rates = &priv->rates; 7649 rates = &priv->rates;
7650 list_del(element); 7650 list_del(element);
@@ -7700,18 +7700,18 @@ static void ipw_rebuild_decrypted_skb(struct ipw_priv *priv,
7700 switch (priv->ieee->sec.level) { 7700 switch (priv->ieee->sec.level) {
7701 case SEC_LEVEL_3: 7701 case SEC_LEVEL_3:
7702 /* Remove CCMP HDR */ 7702 /* Remove CCMP HDR */
7703 memmove(skb->data + IEEE80211_3ADDR_LEN, 7703 memmove(skb->data + LIBIPW_3ADDR_LEN,
7704 skb->data + IEEE80211_3ADDR_LEN + 8, 7704 skb->data + LIBIPW_3ADDR_LEN + 8,
7705 skb->len - IEEE80211_3ADDR_LEN - 8); 7705 skb->len - LIBIPW_3ADDR_LEN - 8);
7706 skb_trim(skb, skb->len - 16); /* CCMP_HDR_LEN + CCMP_MIC_LEN */ 7706 skb_trim(skb, skb->len - 16); /* CCMP_HDR_LEN + CCMP_MIC_LEN */
7707 break; 7707 break;
7708 case SEC_LEVEL_2: 7708 case SEC_LEVEL_2:
7709 break; 7709 break;
7710 case SEC_LEVEL_1: 7710 case SEC_LEVEL_1:
7711 /* Remove IV */ 7711 /* Remove IV */
7712 memmove(skb->data + IEEE80211_3ADDR_LEN, 7712 memmove(skb->data + LIBIPW_3ADDR_LEN,
7713 skb->data + IEEE80211_3ADDR_LEN + 4, 7713 skb->data + LIBIPW_3ADDR_LEN + 4,
7714 skb->len - IEEE80211_3ADDR_LEN - 4); 7714 skb->len - LIBIPW_3ADDR_LEN - 4);
7715 skb_trim(skb, skb->len - 8); /* IV + ICV */ 7715 skb_trim(skb, skb->len - 8); /* IV + ICV */
7716 break; 7716 break;
7717 case SEC_LEVEL_0: 7717 case SEC_LEVEL_0:
@@ -7725,10 +7725,10 @@ static void ipw_rebuild_decrypted_skb(struct ipw_priv *priv,
7725 7725
7726static void ipw_handle_data_packet(struct ipw_priv *priv, 7726static void ipw_handle_data_packet(struct ipw_priv *priv,
7727 struct ipw_rx_mem_buffer *rxb, 7727 struct ipw_rx_mem_buffer *rxb,
7728 struct ieee80211_rx_stats *stats) 7728 struct libipw_rx_stats *stats)
7729{ 7729{
7730 struct net_device *dev = priv->net_dev; 7730 struct net_device *dev = priv->net_dev;
7731 struct ieee80211_hdr_4addr *hdr; 7731 struct libipw_hdr_4addr *hdr;
7732 struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data; 7732 struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data;
7733 7733
7734 /* We received data from the HW, so stop the watchdog */ 7734 /* We received data from the HW, so stop the watchdog */
@@ -7758,15 +7758,15 @@ static void ipw_handle_data_packet(struct ipw_priv *priv,
7758 IPW_DEBUG_RX("Rx packet of %d bytes.\n", rxb->skb->len); 7758 IPW_DEBUG_RX("Rx packet of %d bytes.\n", rxb->skb->len);
7759 7759
7760 /* HW decrypt will not clear the WEP bit, MIC, PN, etc. */ 7760 /* HW decrypt will not clear the WEP bit, MIC, PN, etc. */
7761 hdr = (struct ieee80211_hdr_4addr *)rxb->skb->data; 7761 hdr = (struct libipw_hdr_4addr *)rxb->skb->data;
7762 if (priv->ieee->iw_mode != IW_MODE_MONITOR && 7762 if (priv->ieee->iw_mode != IW_MODE_MONITOR &&
7763 (is_multicast_ether_addr(hdr->addr1) ? 7763 (is_multicast_ether_addr(hdr->addr1) ?
7764 !priv->ieee->host_mc_decrypt : !priv->ieee->host_decrypt)) 7764 !priv->ieee->host_mc_decrypt : !priv->ieee->host_decrypt))
7765 ipw_rebuild_decrypted_skb(priv, rxb->skb); 7765 ipw_rebuild_decrypted_skb(priv, rxb->skb);
7766 7766
7767 if (!ieee80211_rx(priv->ieee, rxb->skb, stats)) 7767 if (!libipw_rx(priv->ieee, rxb->skb, stats))
7768 dev->stats.rx_errors++; 7768 dev->stats.rx_errors++;
7769 else { /* ieee80211_rx succeeded, so it now owns the SKB */ 7769 else { /* libipw_rx succeeded, so it now owns the SKB */
7770 rxb->skb = NULL; 7770 rxb->skb = NULL;
7771 __ipw_led_activity_on(priv); 7771 __ipw_led_activity_on(priv);
7772 } 7772 }
@@ -7775,7 +7775,7 @@ static void ipw_handle_data_packet(struct ipw_priv *priv,
7775#ifdef CONFIG_IPW2200_RADIOTAP 7775#ifdef CONFIG_IPW2200_RADIOTAP
7776static void ipw_handle_data_packet_monitor(struct ipw_priv *priv, 7776static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
7777 struct ipw_rx_mem_buffer *rxb, 7777 struct ipw_rx_mem_buffer *rxb,
7778 struct ieee80211_rx_stats *stats) 7778 struct libipw_rx_stats *stats)
7779{ 7779{
7780 struct net_device *dev = priv->net_dev; 7780 struct net_device *dev = priv->net_dev;
7781 struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data; 7781 struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data;
@@ -7921,9 +7921,9 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
7921 7921
7922 IPW_DEBUG_RX("Rx packet of %d bytes.\n", rxb->skb->len); 7922 IPW_DEBUG_RX("Rx packet of %d bytes.\n", rxb->skb->len);
7923 7923
7924 if (!ieee80211_rx(priv->ieee, rxb->skb, stats)) 7924 if (!libipw_rx(priv->ieee, rxb->skb, stats))
7925 dev->stats.rx_errors++; 7925 dev->stats.rx_errors++;
7926 else { /* ieee80211_rx succeeded, so it now owns the SKB */ 7926 else { /* libipw_rx succeeded, so it now owns the SKB */
7927 rxb->skb = NULL; 7927 rxb->skb = NULL;
7928 /* no LED during capture */ 7928 /* no LED during capture */
7929 } 7929 }
@@ -7931,28 +7931,28 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
7931#endif 7931#endif
7932 7932
7933#ifdef CONFIG_IPW2200_PROMISCUOUS 7933#ifdef CONFIG_IPW2200_PROMISCUOUS
7934#define ieee80211_is_probe_response(fc) \ 7934#define libipw_is_probe_response(fc) \
7935 ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT && \ 7935 ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT && \
7936 (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP ) 7936 (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP )
7937 7937
7938#define ieee80211_is_management(fc) \ 7938#define libipw_is_management(fc) \
7939 ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) 7939 ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)
7940 7940
7941#define ieee80211_is_control(fc) \ 7941#define libipw_is_control(fc) \
7942 ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) 7942 ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL)
7943 7943
7944#define ieee80211_is_data(fc) \ 7944#define libipw_is_data(fc) \
7945 ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) 7945 ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)
7946 7946
7947#define ieee80211_is_assoc_request(fc) \ 7947#define libipw_is_assoc_request(fc) \
7948 ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_ASSOC_REQ) 7948 ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_ASSOC_REQ)
7949 7949
7950#define ieee80211_is_reassoc_request(fc) \ 7950#define libipw_is_reassoc_request(fc) \
7951 ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_REASSOC_REQ) 7951 ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_REASSOC_REQ)
7952 7952
7953static void ipw_handle_promiscuous_rx(struct ipw_priv *priv, 7953static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
7954 struct ipw_rx_mem_buffer *rxb, 7954 struct ipw_rx_mem_buffer *rxb,
7955 struct ieee80211_rx_stats *stats) 7955 struct libipw_rx_stats *stats)
7956{ 7956{
7957 struct net_device *dev = priv->prom_net_dev; 7957 struct net_device *dev = priv->prom_net_dev;
7958 struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data; 7958 struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data;
@@ -8002,17 +8002,17 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
8002 } 8002 }
8003 8003
8004 hdr = (void *)rxb->skb->data + IPW_RX_FRAME_SIZE; 8004 hdr = (void *)rxb->skb->data + IPW_RX_FRAME_SIZE;
8005 if (ieee80211_is_management(le16_to_cpu(hdr->frame_control))) { 8005 if (libipw_is_management(le16_to_cpu(hdr->frame_control))) {
8006 if (filter & IPW_PROM_NO_MGMT) 8006 if (filter & IPW_PROM_NO_MGMT)
8007 return; 8007 return;
8008 if (filter & IPW_PROM_MGMT_HEADER_ONLY) 8008 if (filter & IPW_PROM_MGMT_HEADER_ONLY)
8009 hdr_only = 1; 8009 hdr_only = 1;
8010 } else if (ieee80211_is_control(le16_to_cpu(hdr->frame_control))) { 8010 } else if (libipw_is_control(le16_to_cpu(hdr->frame_control))) {
8011 if (filter & IPW_PROM_NO_CTL) 8011 if (filter & IPW_PROM_NO_CTL)
8012 return; 8012 return;
8013 if (filter & IPW_PROM_CTL_HEADER_ONLY) 8013 if (filter & IPW_PROM_CTL_HEADER_ONLY)
8014 hdr_only = 1; 8014 hdr_only = 1;
8015 } else if (ieee80211_is_data(le16_to_cpu(hdr->frame_control))) { 8015 } else if (libipw_is_data(le16_to_cpu(hdr->frame_control))) {
8016 if (filter & IPW_PROM_NO_DATA) 8016 if (filter & IPW_PROM_NO_DATA)
8017 return; 8017 return;
8018 if (filter & IPW_PROM_DATA_HEADER_ONLY) 8018 if (filter & IPW_PROM_DATA_HEADER_ONLY)
@@ -8030,7 +8030,7 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
8030 ipw_rt = (void *)skb->data; 8030 ipw_rt = (void *)skb->data;
8031 8031
8032 if (hdr_only) 8032 if (hdr_only)
8033 len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control)); 8033 len = libipw_get_hdrlen(le16_to_cpu(hdr->frame_control));
8034 8034
8035 memcpy(ipw_rt->payload, hdr, len); 8035 memcpy(ipw_rt->payload, hdr, len);
8036 8036
@@ -8127,7 +8127,7 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
8127 8127
8128 IPW_DEBUG_RX("Rx packet of %d bytes.\n", skb->len); 8128 IPW_DEBUG_RX("Rx packet of %d bytes.\n", skb->len);
8129 8129
8130 if (!ieee80211_rx(priv->prom_priv->ieee, skb, stats)) { 8130 if (!libipw_rx(priv->prom_priv->ieee, skb, stats)) {
8131 dev->stats.rx_errors++; 8131 dev->stats.rx_errors++;
8132 dev_kfree_skb_any(skb); 8132 dev_kfree_skb_any(skb);
8133 } 8133 }
@@ -8135,7 +8135,7 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
8135#endif 8135#endif
8136 8136
8137static int is_network_packet(struct ipw_priv *priv, 8137static int is_network_packet(struct ipw_priv *priv,
8138 struct ieee80211_hdr_4addr *header) 8138 struct libipw_hdr_4addr *header)
8139{ 8139{
8140 /* Filter incoming packets to determine if they are targetted toward 8140 /* Filter incoming packets to determine if they are targetted toward
8141 * this network, discarding packets coming from ourselves */ 8141 * this network, discarding packets coming from ourselves */
@@ -8173,7 +8173,7 @@ static int is_network_packet(struct ipw_priv *priv,
8173#define IPW_PACKET_RETRY_TIME HZ 8173#define IPW_PACKET_RETRY_TIME HZ
8174 8174
8175static int is_duplicate_packet(struct ipw_priv *priv, 8175static int is_duplicate_packet(struct ipw_priv *priv,
8176 struct ieee80211_hdr_4addr *header) 8176 struct libipw_hdr_4addr *header)
8177{ 8177{
8178 u16 sc = le16_to_cpu(header->seq_ctl); 8178 u16 sc = le16_to_cpu(header->seq_ctl);
8179 u16 seq = WLAN_GET_SEQ_SEQ(sc); 8179 u16 seq = WLAN_GET_SEQ_SEQ(sc);
@@ -8247,14 +8247,14 @@ static int is_duplicate_packet(struct ipw_priv *priv,
8247 8247
8248static void ipw_handle_mgmt_packet(struct ipw_priv *priv, 8248static void ipw_handle_mgmt_packet(struct ipw_priv *priv,
8249 struct ipw_rx_mem_buffer *rxb, 8249 struct ipw_rx_mem_buffer *rxb,
8250 struct ieee80211_rx_stats *stats) 8250 struct libipw_rx_stats *stats)
8251{ 8251{
8252 struct sk_buff *skb = rxb->skb; 8252 struct sk_buff *skb = rxb->skb;
8253 struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)skb->data; 8253 struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)skb->data;
8254 struct ieee80211_hdr_4addr *header = (struct ieee80211_hdr_4addr *) 8254 struct libipw_hdr_4addr *header = (struct libipw_hdr_4addr *)
8255 (skb->data + IPW_RX_FRAME_SIZE); 8255 (skb->data + IPW_RX_FRAME_SIZE);
8256 8256
8257 ieee80211_rx_mgt(priv->ieee, header, stats); 8257 libipw_rx_mgt(priv->ieee, header, stats);
8258 8258
8259 if (priv->ieee->iw_mode == IW_MODE_ADHOC && 8259 if (priv->ieee->iw_mode == IW_MODE_ADHOC &&
8260 ((WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) == 8260 ((WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) ==
@@ -8276,12 +8276,12 @@ static void ipw_handle_mgmt_packet(struct ipw_priv *priv,
8276 /* Advance past the ipw packet header to the 802.11 frame */ 8276 /* Advance past the ipw packet header to the 802.11 frame */
8277 skb_pull(skb, IPW_RX_FRAME_SIZE); 8277 skb_pull(skb, IPW_RX_FRAME_SIZE);
8278 8278
8279 /* Push the ieee80211_rx_stats before the 802.11 frame */ 8279 /* Push the libipw_rx_stats before the 802.11 frame */
8280 memcpy(skb_push(skb, sizeof(*stats)), stats, sizeof(*stats)); 8280 memcpy(skb_push(skb, sizeof(*stats)), stats, sizeof(*stats));
8281 8281
8282 skb->dev = priv->ieee->dev; 8282 skb->dev = priv->ieee->dev;
8283 8283
8284 /* Point raw at the ieee80211_stats */ 8284 /* Point raw at the libipw_stats */
8285 skb_reset_mac_header(skb); 8285 skb_reset_mac_header(skb);
8286 8286
8287 skb->pkt_type = PACKET_OTHERHOST; 8287 skb->pkt_type = PACKET_OTHERHOST;
@@ -8301,7 +8301,7 @@ static void ipw_rx(struct ipw_priv *priv)
8301{ 8301{
8302 struct ipw_rx_mem_buffer *rxb; 8302 struct ipw_rx_mem_buffer *rxb;
8303 struct ipw_rx_packet *pkt; 8303 struct ipw_rx_packet *pkt;
8304 struct ieee80211_hdr_4addr *header; 8304 struct libipw_hdr_4addr *header;
8305 u32 r, w, i; 8305 u32 r, w, i;
8306 u8 network_packet; 8306 u8 network_packet;
8307 u8 fill_rx = 0; 8307 u8 fill_rx = 0;
@@ -8332,7 +8332,7 @@ static void ipw_rx(struct ipw_priv *priv)
8332 8332
8333 switch (pkt->header.message_type) { 8333 switch (pkt->header.message_type) {
8334 case RX_FRAME_TYPE: /* 802.11 frame */ { 8334 case RX_FRAME_TYPE: /* 802.11 frame */ {
8335 struct ieee80211_rx_stats stats = { 8335 struct libipw_rx_stats stats = {
8336 .rssi = pkt->u.frame.rssi_dbm - 8336 .rssi = pkt->u.frame.rssi_dbm -
8337 IPW_RSSI_TO_DBM, 8337 IPW_RSSI_TO_DBM,
8338 .signal = 8338 .signal =
@@ -8347,19 +8347,19 @@ static void ipw_rx(struct ipw_priv *priv)
8347 .freq = 8347 .freq =
8348 (pkt->u.frame. 8348 (pkt->u.frame.
8349 control & (1 << 0)) ? 8349 control & (1 << 0)) ?
8350 IEEE80211_24GHZ_BAND : 8350 LIBIPW_24GHZ_BAND :
8351 IEEE80211_52GHZ_BAND, 8351 LIBIPW_52GHZ_BAND,
8352 .len = le16_to_cpu(pkt->u.frame.length), 8352 .len = le16_to_cpu(pkt->u.frame.length),
8353 }; 8353 };
8354 8354
8355 if (stats.rssi != 0) 8355 if (stats.rssi != 0)
8356 stats.mask |= IEEE80211_STATMASK_RSSI; 8356 stats.mask |= LIBIPW_STATMASK_RSSI;
8357 if (stats.signal != 0) 8357 if (stats.signal != 0)
8358 stats.mask |= IEEE80211_STATMASK_SIGNAL; 8358 stats.mask |= LIBIPW_STATMASK_SIGNAL;
8359 if (stats.noise != 0) 8359 if (stats.noise != 0)
8360 stats.mask |= IEEE80211_STATMASK_NOISE; 8360 stats.mask |= LIBIPW_STATMASK_NOISE;
8361 if (stats.rate != 0) 8361 if (stats.rate != 0)
8362 stats.mask |= IEEE80211_STATMASK_RATE; 8362 stats.mask |= LIBIPW_STATMASK_RATE;
8363 8363
8364 priv->rx_packets++; 8364 priv->rx_packets++;
8365 8365
@@ -8384,7 +8384,7 @@ static void ipw_rx(struct ipw_priv *priv)
8384#endif 8384#endif
8385 8385
8386 header = 8386 header =
8387 (struct ieee80211_hdr_4addr *)(rxb->skb-> 8387 (struct libipw_hdr_4addr *)(rxb->skb->
8388 data + 8388 data +
8389 IPW_RX_FRAME_SIZE); 8389 IPW_RX_FRAME_SIZE);
8390 /* TODO: Check Ad-Hoc dest/source and make sure 8390 /* TODO: Check Ad-Hoc dest/source and make sure
@@ -8407,7 +8407,7 @@ static void ipw_rx(struct ipw_priv *priv)
8407 le16_to_cpu(pkt->u.frame.length)); 8407 le16_to_cpu(pkt->u.frame.length));
8408 8408
8409 if (le16_to_cpu(pkt->u.frame.length) < 8409 if (le16_to_cpu(pkt->u.frame.length) <
8410 ieee80211_get_hdrlen(le16_to_cpu( 8410 libipw_get_hdrlen(le16_to_cpu(
8411 header->frame_ctl))) { 8411 header->frame_ctl))) {
8412 IPW_DEBUG_DROP 8412 IPW_DEBUG_DROP
8413 ("Received packet is too small. " 8413 ("Received packet is too small. "
@@ -8592,9 +8592,9 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)
8592 ": Detected Intel PRO/Wireless 2915ABG Network " 8592 ": Detected Intel PRO/Wireless 2915ABG Network "
8593 "Connection\n"); 8593 "Connection\n");
8594 priv->ieee->abg_true = 1; 8594 priv->ieee->abg_true = 1;
8595 band = IEEE80211_52GHZ_BAND | IEEE80211_24GHZ_BAND; 8595 band = LIBIPW_52GHZ_BAND | LIBIPW_24GHZ_BAND;
8596 modulation = IEEE80211_OFDM_MODULATION | 8596 modulation = LIBIPW_OFDM_MODULATION |
8597 IEEE80211_CCK_MODULATION; 8597 LIBIPW_CCK_MODULATION;
8598 priv->adapter = IPW_2915ABG; 8598 priv->adapter = IPW_2915ABG;
8599 priv->ieee->mode = IEEE_A | IEEE_G | IEEE_B; 8599 priv->ieee->mode = IEEE_A | IEEE_G | IEEE_B;
8600 } else { 8600 } else {
@@ -8604,9 +8604,9 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)
8604 "Connection\n"); 8604 "Connection\n");
8605 8605
8606 priv->ieee->abg_true = 0; 8606 priv->ieee->abg_true = 0;
8607 band = IEEE80211_24GHZ_BAND; 8607 band = LIBIPW_24GHZ_BAND;
8608 modulation = IEEE80211_OFDM_MODULATION | 8608 modulation = LIBIPW_OFDM_MODULATION |
8609 IEEE80211_CCK_MODULATION; 8609 LIBIPW_CCK_MODULATION;
8610 priv->adapter = IPW_2200BG; 8610 priv->adapter = IPW_2200BG;
8611 priv->ieee->mode = IEEE_G | IEEE_B; 8611 priv->ieee->mode = IEEE_G | IEEE_B;
8612 } 8612 }
@@ -8614,7 +8614,7 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)
8614 priv->ieee->freq_band = band; 8614 priv->ieee->freq_band = band;
8615 priv->ieee->modulation = modulation; 8615 priv->ieee->modulation = modulation;
8616 8616
8617 priv->rates_mask = IEEE80211_DEFAULT_RATES_MASK; 8617 priv->rates_mask = LIBIPW_DEFAULT_RATES_MASK;
8618 8618
8619 priv->disassociate_threshold = IPW_MB_DISASSOCIATE_THRESHOLD_DEFAULT; 8619 priv->disassociate_threshold = IPW_MB_DISASSOCIATE_THRESHOLD_DEFAULT;
8620 priv->roaming_threshold = IPW_MB_ROAMING_THRESHOLD_DEFAULT; 8620 priv->roaming_threshold = IPW_MB_ROAMING_THRESHOLD_DEFAULT;
@@ -8644,7 +8644,7 @@ static int ipw_wx_get_name(struct net_device *dev,
8644 struct iw_request_info *info, 8644 struct iw_request_info *info,
8645 union iwreq_data *wrqu, char *extra) 8645 union iwreq_data *wrqu, char *extra)
8646{ 8646{
8647 struct ipw_priv *priv = ieee80211_priv(dev); 8647 struct ipw_priv *priv = libipw_priv(dev);
8648 mutex_lock(&priv->mutex); 8648 mutex_lock(&priv->mutex);
8649 if (priv->status & STATUS_RF_KILL_MASK) 8649 if (priv->status & STATUS_RF_KILL_MASK)
8650 strcpy(wrqu->name, "radio off"); 8650 strcpy(wrqu->name, "radio off");
@@ -8714,8 +8714,8 @@ static int ipw_wx_set_freq(struct net_device *dev,
8714 struct iw_request_info *info, 8714 struct iw_request_info *info,
8715 union iwreq_data *wrqu, char *extra) 8715 union iwreq_data *wrqu, char *extra)
8716{ 8716{
8717 struct ipw_priv *priv = ieee80211_priv(dev); 8717 struct ipw_priv *priv = libipw_priv(dev);
8718 const struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee); 8718 const struct libipw_geo *geo = libipw_get_geo(priv->ieee);
8719 struct iw_freq *fwrq = &wrqu->freq; 8719 struct iw_freq *fwrq = &wrqu->freq;
8720 int ret = 0, i; 8720 int ret = 0, i;
8721 u8 channel, flags; 8721 u8 channel, flags;
@@ -8730,23 +8730,23 @@ static int ipw_wx_set_freq(struct net_device *dev,
8730 } 8730 }
8731 /* if setting by freq convert to channel */ 8731 /* if setting by freq convert to channel */
8732 if (fwrq->e == 1) { 8732 if (fwrq->e == 1) {
8733 channel = ieee80211_freq_to_channel(priv->ieee, fwrq->m); 8733 channel = libipw_freq_to_channel(priv->ieee, fwrq->m);
8734 if (channel == 0) 8734 if (channel == 0)
8735 return -EINVAL; 8735 return -EINVAL;
8736 } else 8736 } else
8737 channel = fwrq->m; 8737 channel = fwrq->m;
8738 8738
8739 if (!(band = ieee80211_is_valid_channel(priv->ieee, channel))) 8739 if (!(band = libipw_is_valid_channel(priv->ieee, channel)))
8740 return -EINVAL; 8740 return -EINVAL;
8741 8741
8742 if (priv->ieee->iw_mode == IW_MODE_ADHOC) { 8742 if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
8743 i = ieee80211_channel_to_index(priv->ieee, channel); 8743 i = libipw_channel_to_index(priv->ieee, channel);
8744 if (i == -1) 8744 if (i == -1)
8745 return -EINVAL; 8745 return -EINVAL;
8746 8746
8747 flags = (band == IEEE80211_24GHZ_BAND) ? 8747 flags = (band == LIBIPW_24GHZ_BAND) ?
8748 geo->bg[i].flags : geo->a[i].flags; 8748 geo->bg[i].flags : geo->a[i].flags;
8749 if (flags & IEEE80211_CH_PASSIVE_ONLY) { 8749 if (flags & LIBIPW_CH_PASSIVE_ONLY) {
8750 IPW_DEBUG_WX("Invalid Ad-Hoc channel for 802.11a\n"); 8750 IPW_DEBUG_WX("Invalid Ad-Hoc channel for 802.11a\n");
8751 return -EINVAL; 8751 return -EINVAL;
8752 } 8752 }
@@ -8763,7 +8763,7 @@ static int ipw_wx_get_freq(struct net_device *dev,
8763 struct iw_request_info *info, 8763 struct iw_request_info *info,
8764 union iwreq_data *wrqu, char *extra) 8764 union iwreq_data *wrqu, char *extra)
8765{ 8765{
8766 struct ipw_priv *priv = ieee80211_priv(dev); 8766 struct ipw_priv *priv = libipw_priv(dev);
8767 8767
8768 wrqu->freq.e = 0; 8768 wrqu->freq.e = 0;
8769 8769
@@ -8774,16 +8774,16 @@ static int ipw_wx_get_freq(struct net_device *dev,
8774 priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED)) { 8774 priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED)) {
8775 int i; 8775 int i;
8776 8776
8777 i = ieee80211_channel_to_index(priv->ieee, priv->channel); 8777 i = libipw_channel_to_index(priv->ieee, priv->channel);
8778 BUG_ON(i == -1); 8778 BUG_ON(i == -1);
8779 wrqu->freq.e = 1; 8779 wrqu->freq.e = 1;
8780 8780
8781 switch (ieee80211_is_valid_channel(priv->ieee, priv->channel)) { 8781 switch (libipw_is_valid_channel(priv->ieee, priv->channel)) {
8782 case IEEE80211_52GHZ_BAND: 8782 case LIBIPW_52GHZ_BAND:
8783 wrqu->freq.m = priv->ieee->geo.a[i].freq * 100000; 8783 wrqu->freq.m = priv->ieee->geo.a[i].freq * 100000;
8784 break; 8784 break;
8785 8785
8786 case IEEE80211_24GHZ_BAND: 8786 case LIBIPW_24GHZ_BAND:
8787 wrqu->freq.m = priv->ieee->geo.bg[i].freq * 100000; 8787 wrqu->freq.m = priv->ieee->geo.bg[i].freq * 100000;
8788 break; 8788 break;
8789 8789
@@ -8802,7 +8802,7 @@ static int ipw_wx_set_mode(struct net_device *dev,
8802 struct iw_request_info *info, 8802 struct iw_request_info *info,
8803 union iwreq_data *wrqu, char *extra) 8803 union iwreq_data *wrqu, char *extra)
8804{ 8804{
8805 struct ipw_priv *priv = ieee80211_priv(dev); 8805 struct ipw_priv *priv = libipw_priv(dev);
8806 int err = 0; 8806 int err = 0;
8807 8807
8808 IPW_DEBUG_WX("Set MODE: %d\n", wrqu->mode); 8808 IPW_DEBUG_WX("Set MODE: %d\n", wrqu->mode);
@@ -8854,7 +8854,7 @@ static int ipw_wx_get_mode(struct net_device *dev,
8854 struct iw_request_info *info, 8854 struct iw_request_info *info,
8855 union iwreq_data *wrqu, char *extra) 8855 union iwreq_data *wrqu, char *extra)
8856{ 8856{
8857 struct ipw_priv *priv = ieee80211_priv(dev); 8857 struct ipw_priv *priv = libipw_priv(dev);
8858 mutex_lock(&priv->mutex); 8858 mutex_lock(&priv->mutex);
8859 wrqu->mode = priv->ieee->iw_mode; 8859 wrqu->mode = priv->ieee->iw_mode;
8860 IPW_DEBUG_WX("Get MODE -> %d\n", wrqu->mode); 8860 IPW_DEBUG_WX("Get MODE -> %d\n", wrqu->mode);
@@ -8883,9 +8883,9 @@ static int ipw_wx_get_range(struct net_device *dev,
8883 struct iw_request_info *info, 8883 struct iw_request_info *info,
8884 union iwreq_data *wrqu, char *extra) 8884 union iwreq_data *wrqu, char *extra)
8885{ 8885{
8886 struct ipw_priv *priv = ieee80211_priv(dev); 8886 struct ipw_priv *priv = libipw_priv(dev);
8887 struct iw_range *range = (struct iw_range *)extra; 8887 struct iw_range *range = (struct iw_range *)extra;
8888 const struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee); 8888 const struct libipw_geo *geo = libipw_get_geo(priv->ieee);
8889 int i = 0, j; 8889 int i = 0, j;
8890 8890
8891 wrqu->data.length = sizeof(*range); 8891 wrqu->data.length = sizeof(*range);
@@ -8929,7 +8929,7 @@ static int ipw_wx_get_range(struct net_device *dev,
8929 if (priv->ieee->mode & (IEEE_B | IEEE_G)) { 8929 if (priv->ieee->mode & (IEEE_B | IEEE_G)) {
8930 for (j = 0; j < geo->bg_channels && i < IW_MAX_FREQUENCIES; j++) { 8930 for (j = 0; j < geo->bg_channels && i < IW_MAX_FREQUENCIES; j++) {
8931 if ((priv->ieee->iw_mode == IW_MODE_ADHOC) && 8931 if ((priv->ieee->iw_mode == IW_MODE_ADHOC) &&
8932 (geo->bg[j].flags & IEEE80211_CH_PASSIVE_ONLY)) 8932 (geo->bg[j].flags & LIBIPW_CH_PASSIVE_ONLY))
8933 continue; 8933 continue;
8934 8934
8935 range->freq[i].i = geo->bg[j].channel; 8935 range->freq[i].i = geo->bg[j].channel;
@@ -8942,7 +8942,7 @@ static int ipw_wx_get_range(struct net_device *dev,
8942 if (priv->ieee->mode & IEEE_A) { 8942 if (priv->ieee->mode & IEEE_A) {
8943 for (j = 0; j < geo->a_channels && i < IW_MAX_FREQUENCIES; j++) { 8943 for (j = 0; j < geo->a_channels && i < IW_MAX_FREQUENCIES; j++) {
8944 if ((priv->ieee->iw_mode == IW_MODE_ADHOC) && 8944 if ((priv->ieee->iw_mode == IW_MODE_ADHOC) &&
8945 (geo->a[j].flags & IEEE80211_CH_PASSIVE_ONLY)) 8945 (geo->a[j].flags & LIBIPW_CH_PASSIVE_ONLY))
8946 continue; 8946 continue;
8947 8947
8948 range->freq[i].i = geo->a[j].channel; 8948 range->freq[i].i = geo->a[j].channel;
@@ -8977,7 +8977,7 @@ static int ipw_wx_set_wap(struct net_device *dev,
8977 struct iw_request_info *info, 8977 struct iw_request_info *info,
8978 union iwreq_data *wrqu, char *extra) 8978 union iwreq_data *wrqu, char *extra)
8979{ 8979{
8980 struct ipw_priv *priv = ieee80211_priv(dev); 8980 struct ipw_priv *priv = libipw_priv(dev);
8981 8981
8982 static const unsigned char any[] = { 8982 static const unsigned char any[] = {
8983 0xff, 0xff, 0xff, 0xff, 0xff, 0xff 8983 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
@@ -9026,7 +9026,7 @@ static int ipw_wx_get_wap(struct net_device *dev,
9026 struct iw_request_info *info, 9026 struct iw_request_info *info,
9027 union iwreq_data *wrqu, char *extra) 9027 union iwreq_data *wrqu, char *extra)
9028{ 9028{
9029 struct ipw_priv *priv = ieee80211_priv(dev); 9029 struct ipw_priv *priv = libipw_priv(dev);
9030 9030
9031 /* If we are associated, trying to associate, or have a statically 9031 /* If we are associated, trying to associate, or have a statically
9032 * configured BSSID then return that; otherwise return ANY */ 9032 * configured BSSID then return that; otherwise return ANY */
@@ -9048,7 +9048,7 @@ static int ipw_wx_set_essid(struct net_device *dev,
9048 struct iw_request_info *info, 9048 struct iw_request_info *info,
9049 union iwreq_data *wrqu, char *extra) 9049 union iwreq_data *wrqu, char *extra)
9050{ 9050{
9051 struct ipw_priv *priv = ieee80211_priv(dev); 9051 struct ipw_priv *priv = libipw_priv(dev);
9052 int length; 9052 int length;
9053 DECLARE_SSID_BUF(ssid); 9053 DECLARE_SSID_BUF(ssid);
9054 9054
@@ -9094,7 +9094,7 @@ static int ipw_wx_get_essid(struct net_device *dev,
9094 struct iw_request_info *info, 9094 struct iw_request_info *info,
9095 union iwreq_data *wrqu, char *extra) 9095 union iwreq_data *wrqu, char *extra)
9096{ 9096{
9097 struct ipw_priv *priv = ieee80211_priv(dev); 9097 struct ipw_priv *priv = libipw_priv(dev);
9098 DECLARE_SSID_BUF(ssid); 9098 DECLARE_SSID_BUF(ssid);
9099 9099
9100 /* If we are associated, trying to associate, or have a statically 9100 /* If we are associated, trying to associate, or have a statically
@@ -9120,7 +9120,7 @@ static int ipw_wx_set_nick(struct net_device *dev,
9120 struct iw_request_info *info, 9120 struct iw_request_info *info,
9121 union iwreq_data *wrqu, char *extra) 9121 union iwreq_data *wrqu, char *extra)
9122{ 9122{
9123 struct ipw_priv *priv = ieee80211_priv(dev); 9123 struct ipw_priv *priv = libipw_priv(dev);
9124 9124
9125 IPW_DEBUG_WX("Setting nick to '%s'\n", extra); 9125 IPW_DEBUG_WX("Setting nick to '%s'\n", extra);
9126 if (wrqu->data.length > IW_ESSID_MAX_SIZE) 9126 if (wrqu->data.length > IW_ESSID_MAX_SIZE)
@@ -9139,7 +9139,7 @@ static int ipw_wx_get_nick(struct net_device *dev,
9139 struct iw_request_info *info, 9139 struct iw_request_info *info,
9140 union iwreq_data *wrqu, char *extra) 9140 union iwreq_data *wrqu, char *extra)
9141{ 9141{
9142 struct ipw_priv *priv = ieee80211_priv(dev); 9142 struct ipw_priv *priv = libipw_priv(dev);
9143 IPW_DEBUG_WX("Getting nick\n"); 9143 IPW_DEBUG_WX("Getting nick\n");
9144 mutex_lock(&priv->mutex); 9144 mutex_lock(&priv->mutex);
9145 wrqu->data.length = strlen(priv->nick); 9145 wrqu->data.length = strlen(priv->nick);
@@ -9153,7 +9153,7 @@ static int ipw_wx_set_sens(struct net_device *dev,
9153 struct iw_request_info *info, 9153 struct iw_request_info *info,
9154 union iwreq_data *wrqu, char *extra) 9154 union iwreq_data *wrqu, char *extra)
9155{ 9155{
9156 struct ipw_priv *priv = ieee80211_priv(dev); 9156 struct ipw_priv *priv = libipw_priv(dev);
9157 int err = 0; 9157 int err = 0;
9158 9158
9159 IPW_DEBUG_WX("Setting roaming threshold to %d\n", wrqu->sens.value); 9159 IPW_DEBUG_WX("Setting roaming threshold to %d\n", wrqu->sens.value);
@@ -9183,7 +9183,7 @@ static int ipw_wx_get_sens(struct net_device *dev,
9183 struct iw_request_info *info, 9183 struct iw_request_info *info,
9184 union iwreq_data *wrqu, char *extra) 9184 union iwreq_data *wrqu, char *extra)
9185{ 9185{
9186 struct ipw_priv *priv = ieee80211_priv(dev); 9186 struct ipw_priv *priv = libipw_priv(dev);
9187 mutex_lock(&priv->mutex); 9187 mutex_lock(&priv->mutex);
9188 wrqu->sens.fixed = 1; 9188 wrqu->sens.fixed = 1;
9189 wrqu->sens.value = priv->roaming_threshold; 9189 wrqu->sens.value = priv->roaming_threshold;
@@ -9200,7 +9200,7 @@ static int ipw_wx_set_rate(struct net_device *dev,
9200 union iwreq_data *wrqu, char *extra) 9200 union iwreq_data *wrqu, char *extra)
9201{ 9201{
9202 /* TODO: We should use semaphores or locks for access to priv */ 9202 /* TODO: We should use semaphores or locks for access to priv */
9203 struct ipw_priv *priv = ieee80211_priv(dev); 9203 struct ipw_priv *priv = libipw_priv(dev);
9204 u32 target_rate = wrqu->bitrate.value; 9204 u32 target_rate = wrqu->bitrate.value;
9205 u32 fixed, mask; 9205 u32 fixed, mask;
9206 9206
@@ -9210,7 +9210,7 @@ static int ipw_wx_set_rate(struct net_device *dev,
9210 9210
9211 if (target_rate == -1) { 9211 if (target_rate == -1) {
9212 fixed = 0; 9212 fixed = 0;
9213 mask = IEEE80211_DEFAULT_RATES_MASK; 9213 mask = LIBIPW_DEFAULT_RATES_MASK;
9214 /* Now we should reassociate */ 9214 /* Now we should reassociate */
9215 goto apply; 9215 goto apply;
9216 } 9216 }
@@ -9219,62 +9219,62 @@ static int ipw_wx_set_rate(struct net_device *dev,
9219 fixed = wrqu->bitrate.fixed; 9219 fixed = wrqu->bitrate.fixed;
9220 9220
9221 if (target_rate == 1000000 || !fixed) 9221 if (target_rate == 1000000 || !fixed)
9222 mask |= IEEE80211_CCK_RATE_1MB_MASK; 9222 mask |= LIBIPW_CCK_RATE_1MB_MASK;
9223 if (target_rate == 1000000) 9223 if (target_rate == 1000000)
9224 goto apply; 9224 goto apply;
9225 9225
9226 if (target_rate == 2000000 || !fixed) 9226 if (target_rate == 2000000 || !fixed)
9227 mask |= IEEE80211_CCK_RATE_2MB_MASK; 9227 mask |= LIBIPW_CCK_RATE_2MB_MASK;
9228 if (target_rate == 2000000) 9228 if (target_rate == 2000000)
9229 goto apply; 9229 goto apply;
9230 9230
9231 if (target_rate == 5500000 || !fixed) 9231 if (target_rate == 5500000 || !fixed)
9232 mask |= IEEE80211_CCK_RATE_5MB_MASK; 9232 mask |= LIBIPW_CCK_RATE_5MB_MASK;
9233 if (target_rate == 5500000) 9233 if (target_rate == 5500000)
9234 goto apply; 9234 goto apply;
9235 9235
9236 if (target_rate == 6000000 || !fixed) 9236 if (target_rate == 6000000 || !fixed)
9237 mask |= IEEE80211_OFDM_RATE_6MB_MASK; 9237 mask |= LIBIPW_OFDM_RATE_6MB_MASK;
9238 if (target_rate == 6000000) 9238 if (target_rate == 6000000)
9239 goto apply; 9239 goto apply;
9240 9240
9241 if (target_rate == 9000000 || !fixed) 9241 if (target_rate == 9000000 || !fixed)
9242 mask |= IEEE80211_OFDM_RATE_9MB_MASK; 9242 mask |= LIBIPW_OFDM_RATE_9MB_MASK;
9243 if (target_rate == 9000000) 9243 if (target_rate == 9000000)
9244 goto apply; 9244 goto apply;
9245 9245
9246 if (target_rate == 11000000 || !fixed) 9246 if (target_rate == 11000000 || !fixed)
9247 mask |= IEEE80211_CCK_RATE_11MB_MASK; 9247 mask |= LIBIPW_CCK_RATE_11MB_MASK;
9248 if (target_rate == 11000000) 9248 if (target_rate == 11000000)
9249 goto apply; 9249 goto apply;
9250 9250
9251 if (target_rate == 12000000 || !fixed) 9251 if (target_rate == 12000000 || !fixed)
9252 mask |= IEEE80211_OFDM_RATE_12MB_MASK; 9252 mask |= LIBIPW_OFDM_RATE_12MB_MASK;
9253 if (target_rate == 12000000) 9253 if (target_rate == 12000000)
9254 goto apply; 9254 goto apply;
9255 9255
9256 if (target_rate == 18000000 || !fixed) 9256 if (target_rate == 18000000 || !fixed)
9257 mask |= IEEE80211_OFDM_RATE_18MB_MASK; 9257 mask |= LIBIPW_OFDM_RATE_18MB_MASK;
9258 if (target_rate == 18000000) 9258 if (target_rate == 18000000)
9259 goto apply; 9259 goto apply;
9260 9260
9261 if (target_rate == 24000000 || !fixed) 9261 if (target_rate == 24000000 || !fixed)
9262 mask |= IEEE80211_OFDM_RATE_24MB_MASK; 9262 mask |= LIBIPW_OFDM_RATE_24MB_MASK;
9263 if (target_rate == 24000000) 9263 if (target_rate == 24000000)
9264 goto apply; 9264 goto apply;
9265 9265
9266 if (target_rate == 36000000 || !fixed) 9266 if (target_rate == 36000000 || !fixed)
9267 mask |= IEEE80211_OFDM_RATE_36MB_MASK; 9267 mask |= LIBIPW_OFDM_RATE_36MB_MASK;
9268 if (target_rate == 36000000) 9268 if (target_rate == 36000000)
9269 goto apply; 9269 goto apply;
9270 9270
9271 if (target_rate == 48000000 || !fixed) 9271 if (target_rate == 48000000 || !fixed)
9272 mask |= IEEE80211_OFDM_RATE_48MB_MASK; 9272 mask |= LIBIPW_OFDM_RATE_48MB_MASK;
9273 if (target_rate == 48000000) 9273 if (target_rate == 48000000)
9274 goto apply; 9274 goto apply;
9275 9275
9276 if (target_rate == 54000000 || !fixed) 9276 if (target_rate == 54000000 || !fixed)
9277 mask |= IEEE80211_OFDM_RATE_54MB_MASK; 9277 mask |= LIBIPW_OFDM_RATE_54MB_MASK;
9278 if (target_rate == 54000000) 9278 if (target_rate == 54000000)
9279 goto apply; 9279 goto apply;
9280 9280
@@ -9285,7 +9285,7 @@ static int ipw_wx_set_rate(struct net_device *dev,
9285 IPW_DEBUG_WX("Setting rate mask to 0x%08X [%s]\n", 9285 IPW_DEBUG_WX("Setting rate mask to 0x%08X [%s]\n",
9286 mask, fixed ? "fixed" : "sub-rates"); 9286 mask, fixed ? "fixed" : "sub-rates");
9287 mutex_lock(&priv->mutex); 9287 mutex_lock(&priv->mutex);
9288 if (mask == IEEE80211_DEFAULT_RATES_MASK) { 9288 if (mask == LIBIPW_DEFAULT_RATES_MASK) {
9289 priv->config &= ~CFG_FIXED_RATE; 9289 priv->config &= ~CFG_FIXED_RATE;
9290 ipw_set_fixed_rate(priv, priv->ieee->mode); 9290 ipw_set_fixed_rate(priv, priv->ieee->mode);
9291 } else 9291 } else
@@ -9312,7 +9312,7 @@ static int ipw_wx_get_rate(struct net_device *dev,
9312 struct iw_request_info *info, 9312 struct iw_request_info *info,
9313 union iwreq_data *wrqu, char *extra) 9313 union iwreq_data *wrqu, char *extra)
9314{ 9314{
9315 struct ipw_priv *priv = ieee80211_priv(dev); 9315 struct ipw_priv *priv = libipw_priv(dev);
9316 mutex_lock(&priv->mutex); 9316 mutex_lock(&priv->mutex);
9317 wrqu->bitrate.value = priv->last_rate; 9317 wrqu->bitrate.value = priv->last_rate;
9318 wrqu->bitrate.fixed = (priv->config & CFG_FIXED_RATE) ? 1 : 0; 9318 wrqu->bitrate.fixed = (priv->config & CFG_FIXED_RATE) ? 1 : 0;
@@ -9325,7 +9325,7 @@ static int ipw_wx_set_rts(struct net_device *dev,
9325 struct iw_request_info *info, 9325 struct iw_request_info *info,
9326 union iwreq_data *wrqu, char *extra) 9326 union iwreq_data *wrqu, char *extra)
9327{ 9327{
9328 struct ipw_priv *priv = ieee80211_priv(dev); 9328 struct ipw_priv *priv = libipw_priv(dev);
9329 mutex_lock(&priv->mutex); 9329 mutex_lock(&priv->mutex);
9330 if (wrqu->rts.disabled || !wrqu->rts.fixed) 9330 if (wrqu->rts.disabled || !wrqu->rts.fixed)
9331 priv->rts_threshold = DEFAULT_RTS_THRESHOLD; 9331 priv->rts_threshold = DEFAULT_RTS_THRESHOLD;
@@ -9348,7 +9348,7 @@ static int ipw_wx_get_rts(struct net_device *dev,
9348 struct iw_request_info *info, 9348 struct iw_request_info *info,
9349 union iwreq_data *wrqu, char *extra) 9349 union iwreq_data *wrqu, char *extra)
9350{ 9350{
9351 struct ipw_priv *priv = ieee80211_priv(dev); 9351 struct ipw_priv *priv = libipw_priv(dev);
9352 mutex_lock(&priv->mutex); 9352 mutex_lock(&priv->mutex);
9353 wrqu->rts.value = priv->rts_threshold; 9353 wrqu->rts.value = priv->rts_threshold;
9354 wrqu->rts.fixed = 0; /* no auto select */ 9354 wrqu->rts.fixed = 0; /* no auto select */
@@ -9362,7 +9362,7 @@ static int ipw_wx_set_txpow(struct net_device *dev,
9362 struct iw_request_info *info, 9362 struct iw_request_info *info,
9363 union iwreq_data *wrqu, char *extra) 9363 union iwreq_data *wrqu, char *extra)
9364{ 9364{
9365 struct ipw_priv *priv = ieee80211_priv(dev); 9365 struct ipw_priv *priv = libipw_priv(dev);
9366 int err = 0; 9366 int err = 0;
9367 9367
9368 mutex_lock(&priv->mutex); 9368 mutex_lock(&priv->mutex);
@@ -9396,7 +9396,7 @@ static int ipw_wx_get_txpow(struct net_device *dev,
9396 struct iw_request_info *info, 9396 struct iw_request_info *info,
9397 union iwreq_data *wrqu, char *extra) 9397 union iwreq_data *wrqu, char *extra)
9398{ 9398{
9399 struct ipw_priv *priv = ieee80211_priv(dev); 9399 struct ipw_priv *priv = libipw_priv(dev);
9400 mutex_lock(&priv->mutex); 9400 mutex_lock(&priv->mutex);
9401 wrqu->power.value = priv->tx_power; 9401 wrqu->power.value = priv->tx_power;
9402 wrqu->power.fixed = 1; 9402 wrqu->power.fixed = 1;
@@ -9414,7 +9414,7 @@ static int ipw_wx_set_frag(struct net_device *dev,
9414 struct iw_request_info *info, 9414 struct iw_request_info *info,
9415 union iwreq_data *wrqu, char *extra) 9415 union iwreq_data *wrqu, char *extra)
9416{ 9416{
9417 struct ipw_priv *priv = ieee80211_priv(dev); 9417 struct ipw_priv *priv = libipw_priv(dev);
9418 mutex_lock(&priv->mutex); 9418 mutex_lock(&priv->mutex);
9419 if (wrqu->frag.disabled || !wrqu->frag.fixed) 9419 if (wrqu->frag.disabled || !wrqu->frag.fixed)
9420 priv->ieee->fts = DEFAULT_FTS; 9420 priv->ieee->fts = DEFAULT_FTS;
@@ -9438,7 +9438,7 @@ static int ipw_wx_get_frag(struct net_device *dev,
9438 struct iw_request_info *info, 9438 struct iw_request_info *info,
9439 union iwreq_data *wrqu, char *extra) 9439 union iwreq_data *wrqu, char *extra)
9440{ 9440{
9441 struct ipw_priv *priv = ieee80211_priv(dev); 9441 struct ipw_priv *priv = libipw_priv(dev);
9442 mutex_lock(&priv->mutex); 9442 mutex_lock(&priv->mutex);
9443 wrqu->frag.value = priv->ieee->fts; 9443 wrqu->frag.value = priv->ieee->fts;
9444 wrqu->frag.fixed = 0; /* no auto select */ 9444 wrqu->frag.fixed = 0; /* no auto select */
@@ -9453,7 +9453,7 @@ static int ipw_wx_set_retry(struct net_device *dev,
9453 struct iw_request_info *info, 9453 struct iw_request_info *info,
9454 union iwreq_data *wrqu, char *extra) 9454 union iwreq_data *wrqu, char *extra)
9455{ 9455{
9456 struct ipw_priv *priv = ieee80211_priv(dev); 9456 struct ipw_priv *priv = libipw_priv(dev);
9457 9457
9458 if (wrqu->retry.flags & IW_RETRY_LIFETIME || wrqu->retry.disabled) 9458 if (wrqu->retry.flags & IW_RETRY_LIFETIME || wrqu->retry.disabled)
9459 return -EINVAL; 9459 return -EINVAL;
@@ -9486,7 +9486,7 @@ static int ipw_wx_get_retry(struct net_device *dev,
9486 struct iw_request_info *info, 9486 struct iw_request_info *info,
9487 union iwreq_data *wrqu, char *extra) 9487 union iwreq_data *wrqu, char *extra)
9488{ 9488{
9489 struct ipw_priv *priv = ieee80211_priv(dev); 9489 struct ipw_priv *priv = libipw_priv(dev);
9490 9490
9491 mutex_lock(&priv->mutex); 9491 mutex_lock(&priv->mutex);
9492 wrqu->retry.disabled = 0; 9492 wrqu->retry.disabled = 0;
@@ -9517,7 +9517,7 @@ static int ipw_wx_set_scan(struct net_device *dev,
9517 struct iw_request_info *info, 9517 struct iw_request_info *info,
9518 union iwreq_data *wrqu, char *extra) 9518 union iwreq_data *wrqu, char *extra)
9519{ 9519{
9520 struct ipw_priv *priv = ieee80211_priv(dev); 9520 struct ipw_priv *priv = libipw_priv(dev);
9521 struct iw_scan_req *req = (struct iw_scan_req *)extra; 9521 struct iw_scan_req *req = (struct iw_scan_req *)extra;
9522 struct delayed_work *work = NULL; 9522 struct delayed_work *work = NULL;
9523 9523
@@ -9553,20 +9553,20 @@ static int ipw_wx_get_scan(struct net_device *dev,
9553 struct iw_request_info *info, 9553 struct iw_request_info *info,
9554 union iwreq_data *wrqu, char *extra) 9554 union iwreq_data *wrqu, char *extra)
9555{ 9555{
9556 struct ipw_priv *priv = ieee80211_priv(dev); 9556 struct ipw_priv *priv = libipw_priv(dev);
9557 return ieee80211_wx_get_scan(priv->ieee, info, wrqu, extra); 9557 return libipw_wx_get_scan(priv->ieee, info, wrqu, extra);
9558} 9558}
9559 9559
9560static int ipw_wx_set_encode(struct net_device *dev, 9560static int ipw_wx_set_encode(struct net_device *dev,
9561 struct iw_request_info *info, 9561 struct iw_request_info *info,
9562 union iwreq_data *wrqu, char *key) 9562 union iwreq_data *wrqu, char *key)
9563{ 9563{
9564 struct ipw_priv *priv = ieee80211_priv(dev); 9564 struct ipw_priv *priv = libipw_priv(dev);
9565 int ret; 9565 int ret;
9566 u32 cap = priv->capability; 9566 u32 cap = priv->capability;
9567 9567
9568 mutex_lock(&priv->mutex); 9568 mutex_lock(&priv->mutex);
9569 ret = ieee80211_wx_set_encode(priv->ieee, info, wrqu, key); 9569 ret = libipw_wx_set_encode(priv->ieee, info, wrqu, key);
9570 9570
9571 /* In IBSS mode, we need to notify the firmware to update 9571 /* In IBSS mode, we need to notify the firmware to update
9572 * the beacon info after we changed the capability. */ 9572 * the beacon info after we changed the capability. */
@@ -9583,15 +9583,15 @@ static int ipw_wx_get_encode(struct net_device *dev,
9583 struct iw_request_info *info, 9583 struct iw_request_info *info,
9584 union iwreq_data *wrqu, char *key) 9584 union iwreq_data *wrqu, char *key)
9585{ 9585{
9586 struct ipw_priv *priv = ieee80211_priv(dev); 9586 struct ipw_priv *priv = libipw_priv(dev);
9587 return ieee80211_wx_get_encode(priv->ieee, info, wrqu, key); 9587 return libipw_wx_get_encode(priv->ieee, info, wrqu, key);
9588} 9588}
9589 9589
9590static int ipw_wx_set_power(struct net_device *dev, 9590static int ipw_wx_set_power(struct net_device *dev,
9591 struct iw_request_info *info, 9591 struct iw_request_info *info,
9592 union iwreq_data *wrqu, char *extra) 9592 union iwreq_data *wrqu, char *extra)
9593{ 9593{
9594 struct ipw_priv *priv = ieee80211_priv(dev); 9594 struct ipw_priv *priv = libipw_priv(dev);
9595 int err; 9595 int err;
9596 mutex_lock(&priv->mutex); 9596 mutex_lock(&priv->mutex);
9597 if (wrqu->power.disabled) { 9597 if (wrqu->power.disabled) {
@@ -9642,7 +9642,7 @@ static int ipw_wx_get_power(struct net_device *dev,
9642 struct iw_request_info *info, 9642 struct iw_request_info *info,
9643 union iwreq_data *wrqu, char *extra) 9643 union iwreq_data *wrqu, char *extra)
9644{ 9644{
9645 struct ipw_priv *priv = ieee80211_priv(dev); 9645 struct ipw_priv *priv = libipw_priv(dev);
9646 mutex_lock(&priv->mutex); 9646 mutex_lock(&priv->mutex);
9647 if (!(priv->power_mode & IPW_POWER_ENABLED)) 9647 if (!(priv->power_mode & IPW_POWER_ENABLED))
9648 wrqu->power.disabled = 1; 9648 wrqu->power.disabled = 1;
@@ -9659,7 +9659,7 @@ static int ipw_wx_set_powermode(struct net_device *dev,
9659 struct iw_request_info *info, 9659 struct iw_request_info *info,
9660 union iwreq_data *wrqu, char *extra) 9660 union iwreq_data *wrqu, char *extra)
9661{ 9661{
9662 struct ipw_priv *priv = ieee80211_priv(dev); 9662 struct ipw_priv *priv = libipw_priv(dev);
9663 int mode = *(int *)extra; 9663 int mode = *(int *)extra;
9664 int err; 9664 int err;
9665 9665
@@ -9685,7 +9685,7 @@ static int ipw_wx_get_powermode(struct net_device *dev,
9685 struct iw_request_info *info, 9685 struct iw_request_info *info,
9686 union iwreq_data *wrqu, char *extra) 9686 union iwreq_data *wrqu, char *extra)
9687{ 9687{
9688 struct ipw_priv *priv = ieee80211_priv(dev); 9688 struct ipw_priv *priv = libipw_priv(dev);
9689 int level = IPW_POWER_LEVEL(priv->power_mode); 9689 int level = IPW_POWER_LEVEL(priv->power_mode);
9690 char *p = extra; 9690 char *p = extra;
9691 9691
@@ -9717,7 +9717,7 @@ static int ipw_wx_set_wireless_mode(struct net_device *dev,
9717 struct iw_request_info *info, 9717 struct iw_request_info *info,
9718 union iwreq_data *wrqu, char *extra) 9718 union iwreq_data *wrqu, char *extra)
9719{ 9719{
9720 struct ipw_priv *priv = ieee80211_priv(dev); 9720 struct ipw_priv *priv = libipw_priv(dev);
9721 int mode = *(int *)extra; 9721 int mode = *(int *)extra;
9722 u8 band = 0, modulation = 0; 9722 u8 band = 0, modulation = 0;
9723 9723
@@ -9729,8 +9729,8 @@ static int ipw_wx_set_wireless_mode(struct net_device *dev,
9729 if (priv->adapter == IPW_2915ABG) { 9729 if (priv->adapter == IPW_2915ABG) {
9730 priv->ieee->abg_true = 1; 9730 priv->ieee->abg_true = 1;
9731 if (mode & IEEE_A) { 9731 if (mode & IEEE_A) {
9732 band |= IEEE80211_52GHZ_BAND; 9732 band |= LIBIPW_52GHZ_BAND;
9733 modulation |= IEEE80211_OFDM_MODULATION; 9733 modulation |= LIBIPW_OFDM_MODULATION;
9734 } else 9734 } else
9735 priv->ieee->abg_true = 0; 9735 priv->ieee->abg_true = 0;
9736 } else { 9736 } else {
@@ -9745,14 +9745,14 @@ static int ipw_wx_set_wireless_mode(struct net_device *dev,
9745 } 9745 }
9746 9746
9747 if (mode & IEEE_B) { 9747 if (mode & IEEE_B) {
9748 band |= IEEE80211_24GHZ_BAND; 9748 band |= LIBIPW_24GHZ_BAND;
9749 modulation |= IEEE80211_CCK_MODULATION; 9749 modulation |= LIBIPW_CCK_MODULATION;
9750 } else 9750 } else
9751 priv->ieee->abg_true = 0; 9751 priv->ieee->abg_true = 0;
9752 9752
9753 if (mode & IEEE_G) { 9753 if (mode & IEEE_G) {
9754 band |= IEEE80211_24GHZ_BAND; 9754 band |= LIBIPW_24GHZ_BAND;
9755 modulation |= IEEE80211_OFDM_MODULATION; 9755 modulation |= LIBIPW_OFDM_MODULATION;
9756 } else 9756 } else
9757 priv->ieee->abg_true = 0; 9757 priv->ieee->abg_true = 0;
9758 9758
@@ -9782,7 +9782,7 @@ static int ipw_wx_get_wireless_mode(struct net_device *dev,
9782 struct iw_request_info *info, 9782 struct iw_request_info *info,
9783 union iwreq_data *wrqu, char *extra) 9783 union iwreq_data *wrqu, char *extra)
9784{ 9784{
9785 struct ipw_priv *priv = ieee80211_priv(dev); 9785 struct ipw_priv *priv = libipw_priv(dev);
9786 mutex_lock(&priv->mutex); 9786 mutex_lock(&priv->mutex);
9787 switch (priv->ieee->mode) { 9787 switch (priv->ieee->mode) {
9788 case IEEE_A: 9788 case IEEE_A:
@@ -9823,7 +9823,7 @@ static int ipw_wx_set_preamble(struct net_device *dev,
9823 struct iw_request_info *info, 9823 struct iw_request_info *info,
9824 union iwreq_data *wrqu, char *extra) 9824 union iwreq_data *wrqu, char *extra)
9825{ 9825{
9826 struct ipw_priv *priv = ieee80211_priv(dev); 9826 struct ipw_priv *priv = libipw_priv(dev);
9827 int mode = *(int *)extra; 9827 int mode = *(int *)extra;
9828 mutex_lock(&priv->mutex); 9828 mutex_lock(&priv->mutex);
9829 /* Switching from SHORT -> LONG requires a disassociation */ 9829 /* Switching from SHORT -> LONG requires a disassociation */
@@ -9856,7 +9856,7 @@ static int ipw_wx_get_preamble(struct net_device *dev,
9856 struct iw_request_info *info, 9856 struct iw_request_info *info,
9857 union iwreq_data *wrqu, char *extra) 9857 union iwreq_data *wrqu, char *extra)
9858{ 9858{
9859 struct ipw_priv *priv = ieee80211_priv(dev); 9859 struct ipw_priv *priv = libipw_priv(dev);
9860 mutex_lock(&priv->mutex); 9860 mutex_lock(&priv->mutex);
9861 if (priv->config & CFG_PREAMBLE_LONG) 9861 if (priv->config & CFG_PREAMBLE_LONG)
9862 snprintf(wrqu->name, IFNAMSIZ, "long (1)"); 9862 snprintf(wrqu->name, IFNAMSIZ, "long (1)");
@@ -9871,7 +9871,7 @@ static int ipw_wx_set_monitor(struct net_device *dev,
9871 struct iw_request_info *info, 9871 struct iw_request_info *info,
9872 union iwreq_data *wrqu, char *extra) 9872 union iwreq_data *wrqu, char *extra)
9873{ 9873{
9874 struct ipw_priv *priv = ieee80211_priv(dev); 9874 struct ipw_priv *priv = libipw_priv(dev);
9875 int *parms = (int *)extra; 9875 int *parms = (int *)extra;
9876 int enable = (parms[0] > 0); 9876 int enable = (parms[0] > 0);
9877 mutex_lock(&priv->mutex); 9877 mutex_lock(&priv->mutex);
@@ -9905,7 +9905,7 @@ static int ipw_wx_reset(struct net_device *dev,
9905 struct iw_request_info *info, 9905 struct iw_request_info *info,
9906 union iwreq_data *wrqu, char *extra) 9906 union iwreq_data *wrqu, char *extra)
9907{ 9907{
9908 struct ipw_priv *priv = ieee80211_priv(dev); 9908 struct ipw_priv *priv = libipw_priv(dev);
9909 IPW_DEBUG_WX("RESET\n"); 9909 IPW_DEBUG_WX("RESET\n");
9910 queue_work(priv->workqueue, &priv->adapter_restart); 9910 queue_work(priv->workqueue, &priv->adapter_restart);
9911 return 0; 9911 return 0;
@@ -9915,7 +9915,7 @@ static int ipw_wx_sw_reset(struct net_device *dev,
9915 struct iw_request_info *info, 9915 struct iw_request_info *info,
9916 union iwreq_data *wrqu, char *extra) 9916 union iwreq_data *wrqu, char *extra)
9917{ 9917{
9918 struct ipw_priv *priv = ieee80211_priv(dev); 9918 struct ipw_priv *priv = libipw_priv(dev);
9919 union iwreq_data wrqu_sec = { 9919 union iwreq_data wrqu_sec = {
9920 .encoding = { 9920 .encoding = {
9921 .flags = IW_ENCODE_DISABLED, 9921 .flags = IW_ENCODE_DISABLED,
@@ -9938,7 +9938,7 @@ static int ipw_wx_sw_reset(struct net_device *dev,
9938 ipw_radio_kill_sw(priv, priv->status & STATUS_RF_KILL_SW); 9938 ipw_radio_kill_sw(priv, priv->status & STATUS_RF_KILL_SW);
9939 9939
9940 mutex_unlock(&priv->mutex); 9940 mutex_unlock(&priv->mutex);
9941 ieee80211_wx_set_encode(priv->ieee, info, &wrqu_sec, NULL); 9941 libipw_wx_set_encode(priv->ieee, info, &wrqu_sec, NULL);
9942 mutex_lock(&priv->mutex); 9942 mutex_lock(&priv->mutex);
9943 9943
9944 if (!(priv->status & STATUS_RF_KILL_MASK)) { 9944 if (!(priv->status & STATUS_RF_KILL_MASK)) {
@@ -10083,7 +10083,7 @@ static struct iw_handler_def ipw_wx_handler_def = {
10083 */ 10083 */
10084static struct iw_statistics *ipw_get_wireless_stats(struct net_device *dev) 10084static struct iw_statistics *ipw_get_wireless_stats(struct net_device *dev)
10085{ 10085{
10086 struct ipw_priv *priv = ieee80211_priv(dev); 10086 struct ipw_priv *priv = libipw_priv(dev);
10087 struct iw_statistics *wstats; 10087 struct iw_statistics *wstats;
10088 10088
10089 wstats = &priv->wstats; 10089 wstats = &priv->wstats;
@@ -10164,13 +10164,13 @@ static int ipw_net_stop(struct net_device *dev)
10164todo: 10164todo:
10165 10165
10166modify to send one tfd per fragment instead of using chunking. otherwise 10166modify to send one tfd per fragment instead of using chunking. otherwise
10167we need to heavily modify the ieee80211_skb_to_txb. 10167we need to heavily modify the libipw_skb_to_txb.
10168*/ 10168*/
10169 10169
10170static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb, 10170static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb,
10171 int pri) 10171 int pri)
10172{ 10172{
10173 struct ieee80211_hdr_3addrqos *hdr = (struct ieee80211_hdr_3addrqos *) 10173 struct libipw_hdr_3addrqos *hdr = (struct libipw_hdr_3addrqos *)
10174 txb->fragments[0]->data; 10174 txb->fragments[0]->data;
10175 int i = 0; 10175 int i = 0;
10176 struct tfd_frame *tfd; 10176 struct tfd_frame *tfd;
@@ -10187,7 +10187,7 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
10187 if (!(priv->status & STATUS_ASSOCIATED)) 10187 if (!(priv->status & STATUS_ASSOCIATED))
10188 goto drop; 10188 goto drop;
10189 10189
10190 hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); 10190 hdr_len = libipw_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
10191 switch (priv->ieee->iw_mode) { 10191 switch (priv->ieee->iw_mode) {
10192 case IW_MODE_ADHOC: 10192 case IW_MODE_ADHOC:
10193 unicast = !is_multicast_ether_addr(hdr->addr1); 10193 unicast = !is_multicast_ether_addr(hdr->addr1);
@@ -10356,13 +10356,13 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
10356 10356
10357 drop: 10357 drop:
10358 IPW_DEBUG_DROP("Silently dropping Tx packet.\n"); 10358 IPW_DEBUG_DROP("Silently dropping Tx packet.\n");
10359 ieee80211_txb_free(txb); 10359 libipw_txb_free(txb);
10360 return NETDEV_TX_OK; 10360 return NETDEV_TX_OK;
10361} 10361}
10362 10362
10363static int ipw_net_is_queue_full(struct net_device *dev, int pri) 10363static int ipw_net_is_queue_full(struct net_device *dev, int pri)
10364{ 10364{
10365 struct ipw_priv *priv = ieee80211_priv(dev); 10365 struct ipw_priv *priv = libipw_priv(dev);
10366#ifdef CONFIG_IPW2200_QOS 10366#ifdef CONFIG_IPW2200_QOS
10367 int tx_id = ipw_get_tx_queue_number(priv, pri); 10367 int tx_id = ipw_get_tx_queue_number(priv, pri);
10368 struct clx2_tx_queue *txq = &priv->txq[tx_id]; 10368 struct clx2_tx_queue *txq = &priv->txq[tx_id];
@@ -10378,9 +10378,9 @@ static int ipw_net_is_queue_full(struct net_device *dev, int pri)
10378 10378
10379#ifdef CONFIG_IPW2200_PROMISCUOUS 10379#ifdef CONFIG_IPW2200_PROMISCUOUS
10380static void ipw_handle_promiscuous_tx(struct ipw_priv *priv, 10380static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,
10381 struct ieee80211_txb *txb) 10381 struct libipw_txb *txb)
10382{ 10382{
10383 struct ieee80211_rx_stats dummystats; 10383 struct libipw_rx_stats dummystats;
10384 struct ieee80211_hdr *hdr; 10384 struct ieee80211_hdr *hdr;
10385 u8 n; 10385 u8 n;
10386 u16 filter = priv->prom_priv->filter; 10386 u16 filter = priv->prom_priv->filter;
@@ -10393,17 +10393,17 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,
10393 10393
10394 /* Filtering of fragment chains is done agains the first fragment */ 10394 /* Filtering of fragment chains is done agains the first fragment */
10395 hdr = (void *)txb->fragments[0]->data; 10395 hdr = (void *)txb->fragments[0]->data;
10396 if (ieee80211_is_management(le16_to_cpu(hdr->frame_control))) { 10396 if (libipw_is_management(le16_to_cpu(hdr->frame_control))) {
10397 if (filter & IPW_PROM_NO_MGMT) 10397 if (filter & IPW_PROM_NO_MGMT)
10398 return; 10398 return;
10399 if (filter & IPW_PROM_MGMT_HEADER_ONLY) 10399 if (filter & IPW_PROM_MGMT_HEADER_ONLY)
10400 hdr_only = 1; 10400 hdr_only = 1;
10401 } else if (ieee80211_is_control(le16_to_cpu(hdr->frame_control))) { 10401 } else if (libipw_is_control(le16_to_cpu(hdr->frame_control))) {
10402 if (filter & IPW_PROM_NO_CTL) 10402 if (filter & IPW_PROM_NO_CTL)
10403 return; 10403 return;
10404 if (filter & IPW_PROM_CTL_HEADER_ONLY) 10404 if (filter & IPW_PROM_CTL_HEADER_ONLY)
10405 hdr_only = 1; 10405 hdr_only = 1;
10406 } else if (ieee80211_is_data(le16_to_cpu(hdr->frame_control))) { 10406 } else if (libipw_is_data(le16_to_cpu(hdr->frame_control))) {
10407 if (filter & IPW_PROM_NO_DATA) 10407 if (filter & IPW_PROM_NO_DATA)
10408 return; 10408 return;
10409 if (filter & IPW_PROM_DATA_HEADER_ONLY) 10409 if (filter & IPW_PROM_DATA_HEADER_ONLY)
@@ -10418,7 +10418,7 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,
10418 10418
10419 if (hdr_only) { 10419 if (hdr_only) {
10420 hdr = (void *)src->data; 10420 hdr = (void *)src->data;
10421 len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control)); 10421 len = libipw_get_hdrlen(le16_to_cpu(hdr->frame_control));
10422 } else 10422 } else
10423 len = src->len; 10423 len = src->len;
10424 10424
@@ -10452,16 +10452,16 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,
10452 10452
10453 skb_copy_from_linear_data(src, skb_put(dst, len), len); 10453 skb_copy_from_linear_data(src, skb_put(dst, len), len);
10454 10454
10455 if (!ieee80211_rx(priv->prom_priv->ieee, dst, &dummystats)) 10455 if (!libipw_rx(priv->prom_priv->ieee, dst, &dummystats))
10456 dev_kfree_skb_any(dst); 10456 dev_kfree_skb_any(dst);
10457 } 10457 }
10458} 10458}
10459#endif 10459#endif
10460 10460
10461static int ipw_net_hard_start_xmit(struct ieee80211_txb *txb, 10461static int ipw_net_hard_start_xmit(struct libipw_txb *txb,
10462 struct net_device *dev, int pri) 10462 struct net_device *dev, int pri)
10463{ 10463{
10464 struct ipw_priv *priv = ieee80211_priv(dev); 10464 struct ipw_priv *priv = libipw_priv(dev);
10465 unsigned long flags; 10465 unsigned long flags;
10466 int ret; 10466 int ret;
10467 10467
@@ -10488,7 +10488,7 @@ static void ipw_net_set_multicast_list(struct net_device *dev)
10488 10488
10489static int ipw_net_set_mac_address(struct net_device *dev, void *p) 10489static int ipw_net_set_mac_address(struct net_device *dev, void *p)
10490{ 10490{
10491 struct ipw_priv *priv = ieee80211_priv(dev); 10491 struct ipw_priv *priv = libipw_priv(dev);
10492 struct sockaddr *addr = p; 10492 struct sockaddr *addr = p;
10493 10493
10494 if (!is_valid_ether_addr(addr->sa_data)) 10494 if (!is_valid_ether_addr(addr->sa_data))
@@ -10506,7 +10506,7 @@ static int ipw_net_set_mac_address(struct net_device *dev, void *p)
10506static void ipw_ethtool_get_drvinfo(struct net_device *dev, 10506static void ipw_ethtool_get_drvinfo(struct net_device *dev,
10507 struct ethtool_drvinfo *info) 10507 struct ethtool_drvinfo *info)
10508{ 10508{
10509 struct ipw_priv *p = ieee80211_priv(dev); 10509 struct ipw_priv *p = libipw_priv(dev);
10510 char vers[64]; 10510 char vers[64];
10511 char date[32]; 10511 char date[32];
10512 u32 len; 10512 u32 len;
@@ -10527,7 +10527,7 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,
10527 10527
10528static u32 ipw_ethtool_get_link(struct net_device *dev) 10528static u32 ipw_ethtool_get_link(struct net_device *dev)
10529{ 10529{
10530 struct ipw_priv *priv = ieee80211_priv(dev); 10530 struct ipw_priv *priv = libipw_priv(dev);
10531 return (priv->status & STATUS_ASSOCIATED) != 0; 10531 return (priv->status & STATUS_ASSOCIATED) != 0;
10532} 10532}
10533 10533
@@ -10539,7 +10539,7 @@ static int ipw_ethtool_get_eeprom_len(struct net_device *dev)
10539static int ipw_ethtool_get_eeprom(struct net_device *dev, 10539static int ipw_ethtool_get_eeprom(struct net_device *dev,
10540 struct ethtool_eeprom *eeprom, u8 * bytes) 10540 struct ethtool_eeprom *eeprom, u8 * bytes)
10541{ 10541{
10542 struct ipw_priv *p = ieee80211_priv(dev); 10542 struct ipw_priv *p = libipw_priv(dev);
10543 10543
10544 if (eeprom->offset + eeprom->len > IPW_EEPROM_IMAGE_SIZE) 10544 if (eeprom->offset + eeprom->len > IPW_EEPROM_IMAGE_SIZE)
10545 return -EINVAL; 10545 return -EINVAL;
@@ -10552,7 +10552,7 @@ static int ipw_ethtool_get_eeprom(struct net_device *dev,
10552static int ipw_ethtool_set_eeprom(struct net_device *dev, 10552static int ipw_ethtool_set_eeprom(struct net_device *dev,
10553 struct ethtool_eeprom *eeprom, u8 * bytes) 10553 struct ethtool_eeprom *eeprom, u8 * bytes)
10554{ 10554{
10555 struct ipw_priv *p = ieee80211_priv(dev); 10555 struct ipw_priv *p = libipw_priv(dev);
10556 int i; 10556 int i;
10557 10557
10558 if (eeprom->offset + eeprom->len > IPW_EEPROM_IMAGE_SIZE) 10558 if (eeprom->offset + eeprom->len > IPW_EEPROM_IMAGE_SIZE)
@@ -10768,9 +10768,9 @@ static int __devinit ipw_setup_deferred_work(struct ipw_priv *priv)
10768} 10768}
10769 10769
10770static void shim__set_security(struct net_device *dev, 10770static void shim__set_security(struct net_device *dev,
10771 struct ieee80211_security *sec) 10771 struct libipw_security *sec)
10772{ 10772{
10773 struct ipw_priv *priv = ieee80211_priv(dev); 10773 struct ipw_priv *priv = libipw_priv(dev);
10774 int i; 10774 int i;
10775 for (i = 0; i < 4; i++) { 10775 for (i = 0; i < 4; i++) {
10776 if (sec->flags & (1 << i)) { 10776 if (sec->flags & (1 << i)) {
@@ -10855,21 +10855,21 @@ static int init_supported_rates(struct ipw_priv *priv,
10855 memset(rates, 0, sizeof(*rates)); 10855 memset(rates, 0, sizeof(*rates));
10856 /* configure supported rates */ 10856 /* configure supported rates */
10857 switch (priv->ieee->freq_band) { 10857 switch (priv->ieee->freq_band) {
10858 case IEEE80211_52GHZ_BAND: 10858 case LIBIPW_52GHZ_BAND:
10859 rates->ieee_mode = IPW_A_MODE; 10859 rates->ieee_mode = IPW_A_MODE;
10860 rates->purpose = IPW_RATE_CAPABILITIES; 10860 rates->purpose = IPW_RATE_CAPABILITIES;
10861 ipw_add_ofdm_scan_rates(rates, IEEE80211_CCK_MODULATION, 10861 ipw_add_ofdm_scan_rates(rates, LIBIPW_CCK_MODULATION,
10862 IEEE80211_OFDM_DEFAULT_RATES_MASK); 10862 LIBIPW_OFDM_DEFAULT_RATES_MASK);
10863 break; 10863 break;
10864 10864
10865 default: /* Mixed or 2.4Ghz */ 10865 default: /* Mixed or 2.4Ghz */
10866 rates->ieee_mode = IPW_G_MODE; 10866 rates->ieee_mode = IPW_G_MODE;
10867 rates->purpose = IPW_RATE_CAPABILITIES; 10867 rates->purpose = IPW_RATE_CAPABILITIES;
10868 ipw_add_cck_scan_rates(rates, IEEE80211_CCK_MODULATION, 10868 ipw_add_cck_scan_rates(rates, LIBIPW_CCK_MODULATION,
10869 IEEE80211_CCK_DEFAULT_RATES_MASK); 10869 LIBIPW_CCK_DEFAULT_RATES_MASK);
10870 if (priv->ieee->modulation & IEEE80211_OFDM_MODULATION) { 10870 if (priv->ieee->modulation & LIBIPW_OFDM_MODULATION) {
10871 ipw_add_ofdm_scan_rates(rates, IEEE80211_CCK_MODULATION, 10871 ipw_add_ofdm_scan_rates(rates, LIBIPW_CCK_MODULATION,
10872 IEEE80211_OFDM_DEFAULT_RATES_MASK); 10872 LIBIPW_OFDM_DEFAULT_RATES_MASK);
10873 } 10873 }
10874 break; 10874 break;
10875 } 10875 }
@@ -10975,7 +10975,7 @@ static int ipw_config(struct ipw_priv *priv)
10975 * table. 10975 * table.
10976 * 10976 *
10977 */ 10977 */
10978static const struct ieee80211_geo ipw_geos[] = { 10978static const struct libipw_geo ipw_geos[] = {
10979 { /* Restricted */ 10979 { /* Restricted */
10980 "---", 10980 "---",
10981 .bg_channels = 11, 10981 .bg_channels = 11,
@@ -10997,10 +10997,10 @@ static const struct ieee80211_geo ipw_geos[] = {
10997 {5200, 40}, 10997 {5200, 40},
10998 {5220, 44}, 10998 {5220, 44},
10999 {5240, 48}, 10999 {5240, 48},
11000 {5260, 52, IEEE80211_CH_PASSIVE_ONLY}, 11000 {5260, 52, LIBIPW_CH_PASSIVE_ONLY},
11001 {5280, 56, IEEE80211_CH_PASSIVE_ONLY}, 11001 {5280, 56, LIBIPW_CH_PASSIVE_ONLY},
11002 {5300, 60, IEEE80211_CH_PASSIVE_ONLY}, 11002 {5300, 60, LIBIPW_CH_PASSIVE_ONLY},
11003 {5320, 64, IEEE80211_CH_PASSIVE_ONLY}}, 11003 {5320, 64, LIBIPW_CH_PASSIVE_ONLY}},
11004 }, 11004 },
11005 11005
11006 { /* Rest of World */ 11006 { /* Rest of World */
@@ -11025,10 +11025,10 @@ static const struct ieee80211_geo ipw_geos[] = {
11025 {5200, 40}, 11025 {5200, 40},
11026 {5220, 44}, 11026 {5220, 44},
11027 {5240, 48}, 11027 {5240, 48},
11028 {5260, 52, IEEE80211_CH_PASSIVE_ONLY}, 11028 {5260, 52, LIBIPW_CH_PASSIVE_ONLY},
11029 {5280, 56, IEEE80211_CH_PASSIVE_ONLY}, 11029 {5280, 56, LIBIPW_CH_PASSIVE_ONLY},
11030 {5300, 60, IEEE80211_CH_PASSIVE_ONLY}, 11030 {5300, 60, LIBIPW_CH_PASSIVE_ONLY},
11031 {5320, 64, IEEE80211_CH_PASSIVE_ONLY}, 11031 {5320, 64, LIBIPW_CH_PASSIVE_ONLY},
11032 {5745, 149}, 11032 {5745, 149},
11033 {5765, 153}, 11033 {5765, 153},
11034 {5785, 157}, 11034 {5785, 157},
@@ -11048,15 +11048,15 @@ static const struct ieee80211_geo ipw_geos[] = {
11048 {5200, 40}, 11048 {5200, 40},
11049 {5220, 44}, 11049 {5220, 44},
11050 {5240, 48}, 11050 {5240, 48},
11051 {5260, 52, IEEE80211_CH_PASSIVE_ONLY}, 11051 {5260, 52, LIBIPW_CH_PASSIVE_ONLY},
11052 {5280, 56, IEEE80211_CH_PASSIVE_ONLY}, 11052 {5280, 56, LIBIPW_CH_PASSIVE_ONLY},
11053 {5300, 60, IEEE80211_CH_PASSIVE_ONLY}, 11053 {5300, 60, LIBIPW_CH_PASSIVE_ONLY},
11054 {5320, 64, IEEE80211_CH_PASSIVE_ONLY}, 11054 {5320, 64, LIBIPW_CH_PASSIVE_ONLY},
11055 {5745, 149, IEEE80211_CH_PASSIVE_ONLY}, 11055 {5745, 149, LIBIPW_CH_PASSIVE_ONLY},
11056 {5765, 153, IEEE80211_CH_PASSIVE_ONLY}, 11056 {5765, 153, LIBIPW_CH_PASSIVE_ONLY},
11057 {5785, 157, IEEE80211_CH_PASSIVE_ONLY}, 11057 {5785, 157, LIBIPW_CH_PASSIVE_ONLY},
11058 {5805, 161, IEEE80211_CH_PASSIVE_ONLY}, 11058 {5805, 161, LIBIPW_CH_PASSIVE_ONLY},
11059 {5825, 165, IEEE80211_CH_PASSIVE_ONLY}}, 11059 {5825, 165, LIBIPW_CH_PASSIVE_ONLY}},
11060 }, 11060 },
11061 11061
11062 { /* Custom Japan */ 11062 { /* Custom Japan */
@@ -11093,21 +11093,21 @@ static const struct ieee80211_geo ipw_geos[] = {
11093 {5200, 40}, 11093 {5200, 40},
11094 {5220, 44}, 11094 {5220, 44},
11095 {5240, 48}, 11095 {5240, 48},
11096 {5260, 52, IEEE80211_CH_PASSIVE_ONLY}, 11096 {5260, 52, LIBIPW_CH_PASSIVE_ONLY},
11097 {5280, 56, IEEE80211_CH_PASSIVE_ONLY}, 11097 {5280, 56, LIBIPW_CH_PASSIVE_ONLY},
11098 {5300, 60, IEEE80211_CH_PASSIVE_ONLY}, 11098 {5300, 60, LIBIPW_CH_PASSIVE_ONLY},
11099 {5320, 64, IEEE80211_CH_PASSIVE_ONLY}, 11099 {5320, 64, LIBIPW_CH_PASSIVE_ONLY},
11100 {5500, 100, IEEE80211_CH_PASSIVE_ONLY}, 11100 {5500, 100, LIBIPW_CH_PASSIVE_ONLY},
11101 {5520, 104, IEEE80211_CH_PASSIVE_ONLY}, 11101 {5520, 104, LIBIPW_CH_PASSIVE_ONLY},
11102 {5540, 108, IEEE80211_CH_PASSIVE_ONLY}, 11102 {5540, 108, LIBIPW_CH_PASSIVE_ONLY},
11103 {5560, 112, IEEE80211_CH_PASSIVE_ONLY}, 11103 {5560, 112, LIBIPW_CH_PASSIVE_ONLY},
11104 {5580, 116, IEEE80211_CH_PASSIVE_ONLY}, 11104 {5580, 116, LIBIPW_CH_PASSIVE_ONLY},
11105 {5600, 120, IEEE80211_CH_PASSIVE_ONLY}, 11105 {5600, 120, LIBIPW_CH_PASSIVE_ONLY},
11106 {5620, 124, IEEE80211_CH_PASSIVE_ONLY}, 11106 {5620, 124, LIBIPW_CH_PASSIVE_ONLY},
11107 {5640, 128, IEEE80211_CH_PASSIVE_ONLY}, 11107 {5640, 128, LIBIPW_CH_PASSIVE_ONLY},
11108 {5660, 132, IEEE80211_CH_PASSIVE_ONLY}, 11108 {5660, 132, LIBIPW_CH_PASSIVE_ONLY},
11109 {5680, 136, IEEE80211_CH_PASSIVE_ONLY}, 11109 {5680, 136, LIBIPW_CH_PASSIVE_ONLY},
11110 {5700, 140, IEEE80211_CH_PASSIVE_ONLY}}, 11110 {5700, 140, LIBIPW_CH_PASSIVE_ONLY}},
11111 }, 11111 },
11112 11112
11113 { /* Custom Japan */ 11113 { /* Custom Japan */
@@ -11117,7 +11117,7 @@ static const struct ieee80211_geo ipw_geos[] = {
11117 {2427, 4}, {2432, 5}, {2437, 6}, 11117 {2427, 4}, {2432, 5}, {2437, 6},
11118 {2442, 7}, {2447, 8}, {2452, 9}, 11118 {2442, 7}, {2447, 8}, {2452, 9},
11119 {2457, 10}, {2462, 11}, {2467, 12}, 11119 {2457, 10}, {2462, 11}, {2467, 12},
11120 {2472, 13}, {2484, 14, IEEE80211_CH_B_ONLY}}, 11120 {2472, 13}, {2484, 14, LIBIPW_CH_B_ONLY}},
11121 .a_channels = 4, 11121 .a_channels = 4,
11122 .a = {{5170, 34}, {5190, 38}, 11122 .a = {{5170, 34}, {5190, 38},
11123 {5210, 42}, {5230, 46}}, 11123 {5210, 42}, {5230, 46}},
@@ -11130,8 +11130,8 @@ static const struct ieee80211_geo ipw_geos[] = {
11130 {2427, 4}, {2432, 5}, {2437, 6}, 11130 {2427, 4}, {2432, 5}, {2437, 6},
11131 {2442, 7}, {2447, 8}, {2452, 9}, 11131 {2442, 7}, {2447, 8}, {2452, 9},
11132 {2457, 10}, {2462, 11}, {2467, 12}, 11132 {2457, 10}, {2462, 11}, {2467, 12},
11133 {2472, 13}, {2484, 14, IEEE80211_CH_B_ONLY | 11133 {2472, 13}, {2484, 14, LIBIPW_CH_B_ONLY |
11134 IEEE80211_CH_PASSIVE_ONLY}}, 11134 LIBIPW_CH_PASSIVE_ONLY}},
11135 }, 11135 },
11136 11136
11137 { /* High Band */ 11137 { /* High Band */
@@ -11141,8 +11141,8 @@ static const struct ieee80211_geo ipw_geos[] = {
11141 {2427, 4}, {2432, 5}, {2437, 6}, 11141 {2427, 4}, {2432, 5}, {2437, 6},
11142 {2442, 7}, {2447, 8}, {2452, 9}, 11142 {2442, 7}, {2447, 8}, {2452, 9},
11143 {2457, 10}, {2462, 11}, 11143 {2457, 10}, {2462, 11},
11144 {2467, 12, IEEE80211_CH_PASSIVE_ONLY}, 11144 {2467, 12, LIBIPW_CH_PASSIVE_ONLY},
11145 {2472, 13, IEEE80211_CH_PASSIVE_ONLY}}, 11145 {2472, 13, LIBIPW_CH_PASSIVE_ONLY}},
11146 .a_channels = 4, 11146 .a_channels = 4,
11147 .a = {{5745, 149}, {5765, 153}, 11147 .a = {{5745, 149}, {5765, 153},
11148 {5785, 157}, {5805, 161}}, 11148 {5785, 157}, {5805, 161}},
@@ -11168,33 +11168,33 @@ static const struct ieee80211_geo ipw_geos[] = {
11168 {2427, 4}, {2432, 5}, {2437, 6}, 11168 {2427, 4}, {2432, 5}, {2437, 6},
11169 {2442, 7}, {2447, 8}, {2452, 9}, 11169 {2442, 7}, {2447, 8}, {2452, 9},
11170 {2457, 10}, {2462, 11}, 11170 {2457, 10}, {2462, 11},
11171 {2467, 12, IEEE80211_CH_PASSIVE_ONLY}, 11171 {2467, 12, LIBIPW_CH_PASSIVE_ONLY},
11172 {2472, 13, IEEE80211_CH_PASSIVE_ONLY}}, 11172 {2472, 13, LIBIPW_CH_PASSIVE_ONLY}},
11173 .a_channels = 24, 11173 .a_channels = 24,
11174 .a = {{5180, 36, IEEE80211_CH_PASSIVE_ONLY}, 11174 .a = {{5180, 36, LIBIPW_CH_PASSIVE_ONLY},
11175 {5200, 40, IEEE80211_CH_PASSIVE_ONLY}, 11175 {5200, 40, LIBIPW_CH_PASSIVE_ONLY},
11176 {5220, 44, IEEE80211_CH_PASSIVE_ONLY}, 11176 {5220, 44, LIBIPW_CH_PASSIVE_ONLY},
11177 {5240, 48, IEEE80211_CH_PASSIVE_ONLY}, 11177 {5240, 48, LIBIPW_CH_PASSIVE_ONLY},
11178 {5260, 52, IEEE80211_CH_PASSIVE_ONLY}, 11178 {5260, 52, LIBIPW_CH_PASSIVE_ONLY},
11179 {5280, 56, IEEE80211_CH_PASSIVE_ONLY}, 11179 {5280, 56, LIBIPW_CH_PASSIVE_ONLY},
11180 {5300, 60, IEEE80211_CH_PASSIVE_ONLY}, 11180 {5300, 60, LIBIPW_CH_PASSIVE_ONLY},
11181 {5320, 64, IEEE80211_CH_PASSIVE_ONLY}, 11181 {5320, 64, LIBIPW_CH_PASSIVE_ONLY},
11182 {5500, 100, IEEE80211_CH_PASSIVE_ONLY}, 11182 {5500, 100, LIBIPW_CH_PASSIVE_ONLY},
11183 {5520, 104, IEEE80211_CH_PASSIVE_ONLY}, 11183 {5520, 104, LIBIPW_CH_PASSIVE_ONLY},
11184 {5540, 108, IEEE80211_CH_PASSIVE_ONLY}, 11184 {5540, 108, LIBIPW_CH_PASSIVE_ONLY},
11185 {5560, 112, IEEE80211_CH_PASSIVE_ONLY}, 11185 {5560, 112, LIBIPW_CH_PASSIVE_ONLY},
11186 {5580, 116, IEEE80211_CH_PASSIVE_ONLY}, 11186 {5580, 116, LIBIPW_CH_PASSIVE_ONLY},
11187 {5600, 120, IEEE80211_CH_PASSIVE_ONLY}, 11187 {5600, 120, LIBIPW_CH_PASSIVE_ONLY},
11188 {5620, 124, IEEE80211_CH_PASSIVE_ONLY}, 11188 {5620, 124, LIBIPW_CH_PASSIVE_ONLY},
11189 {5640, 128, IEEE80211_CH_PASSIVE_ONLY}, 11189 {5640, 128, LIBIPW_CH_PASSIVE_ONLY},
11190 {5660, 132, IEEE80211_CH_PASSIVE_ONLY}, 11190 {5660, 132, LIBIPW_CH_PASSIVE_ONLY},
11191 {5680, 136, IEEE80211_CH_PASSIVE_ONLY}, 11191 {5680, 136, LIBIPW_CH_PASSIVE_ONLY},
11192 {5700, 140, IEEE80211_CH_PASSIVE_ONLY}, 11192 {5700, 140, LIBIPW_CH_PASSIVE_ONLY},
11193 {5745, 149, IEEE80211_CH_PASSIVE_ONLY}, 11193 {5745, 149, LIBIPW_CH_PASSIVE_ONLY},
11194 {5765, 153, IEEE80211_CH_PASSIVE_ONLY}, 11194 {5765, 153, LIBIPW_CH_PASSIVE_ONLY},
11195 {5785, 157, IEEE80211_CH_PASSIVE_ONLY}, 11195 {5785, 157, LIBIPW_CH_PASSIVE_ONLY},
11196 {5805, 161, IEEE80211_CH_PASSIVE_ONLY}, 11196 {5805, 161, LIBIPW_CH_PASSIVE_ONLY},
11197 {5825, 165, IEEE80211_CH_PASSIVE_ONLY}}, 11197 {5825, 165, LIBIPW_CH_PASSIVE_ONLY}},
11198 }, 11198 },
11199 11199
11200 { /* Europe */ 11200 { /* Europe */
@@ -11205,19 +11205,19 @@ static const struct ieee80211_geo ipw_geos[] = {
11205 {2442, 7}, {2447, 8}, {2452, 9}, 11205 {2442, 7}, {2447, 8}, {2452, 9},
11206 {2457, 10}, {2462, 11}}, 11206 {2457, 10}, {2462, 11}},
11207 .a_channels = 13, 11207 .a_channels = 13,
11208 .a = {{5180, 36, IEEE80211_CH_PASSIVE_ONLY}, 11208 .a = {{5180, 36, LIBIPW_CH_PASSIVE_ONLY},
11209 {5200, 40, IEEE80211_CH_PASSIVE_ONLY}, 11209 {5200, 40, LIBIPW_CH_PASSIVE_ONLY},
11210 {5220, 44, IEEE80211_CH_PASSIVE_ONLY}, 11210 {5220, 44, LIBIPW_CH_PASSIVE_ONLY},
11211 {5240, 48, IEEE80211_CH_PASSIVE_ONLY}, 11211 {5240, 48, LIBIPW_CH_PASSIVE_ONLY},
11212 {5260, 52, IEEE80211_CH_PASSIVE_ONLY}, 11212 {5260, 52, LIBIPW_CH_PASSIVE_ONLY},
11213 {5280, 56, IEEE80211_CH_PASSIVE_ONLY}, 11213 {5280, 56, LIBIPW_CH_PASSIVE_ONLY},
11214 {5300, 60, IEEE80211_CH_PASSIVE_ONLY}, 11214 {5300, 60, LIBIPW_CH_PASSIVE_ONLY},
11215 {5320, 64, IEEE80211_CH_PASSIVE_ONLY}, 11215 {5320, 64, LIBIPW_CH_PASSIVE_ONLY},
11216 {5745, 149, IEEE80211_CH_PASSIVE_ONLY}, 11216 {5745, 149, LIBIPW_CH_PASSIVE_ONLY},
11217 {5765, 153, IEEE80211_CH_PASSIVE_ONLY}, 11217 {5765, 153, LIBIPW_CH_PASSIVE_ONLY},
11218 {5785, 157, IEEE80211_CH_PASSIVE_ONLY}, 11218 {5785, 157, LIBIPW_CH_PASSIVE_ONLY},
11219 {5805, 161, IEEE80211_CH_PASSIVE_ONLY}, 11219 {5805, 161, LIBIPW_CH_PASSIVE_ONLY},
11220 {5825, 165, IEEE80211_CH_PASSIVE_ONLY}}, 11220 {5825, 165, LIBIPW_CH_PASSIVE_ONLY}},
11221 } 11221 }
11222}; 11222};
11223 11223
@@ -11228,7 +11228,7 @@ static int ipw_up(struct ipw_priv *priv)
11228 11228
11229 /* Age scan list entries found before suspend */ 11229 /* Age scan list entries found before suspend */
11230 if (priv->suspend_time) { 11230 if (priv->suspend_time) {
11231 ieee80211_networks_age(priv->ieee, priv->suspend_time); 11231 libipw_networks_age(priv->ieee, priv->suspend_time);
11232 priv->suspend_time = 0; 11232 priv->suspend_time = 0;
11233 } 11233 }
11234 11234
@@ -11273,7 +11273,7 @@ static int ipw_up(struct ipw_priv *priv)
11273 priv->eeprom[EEPROM_COUNTRY_CODE + 2]); 11273 priv->eeprom[EEPROM_COUNTRY_CODE + 2]);
11274 j = 0; 11274 j = 0;
11275 } 11275 }
11276 if (ieee80211_set_geo(priv->ieee, &ipw_geos[j])) { 11276 if (libipw_set_geo(priv->ieee, &ipw_geos[j])) {
11277 IPW_WARNING("Could not set geography."); 11277 IPW_WARNING("Could not set geography.");
11278 return 0; 11278 return 0;
11279 } 11279 }
@@ -11401,7 +11401,7 @@ static void ipw_bg_down(struct work_struct *work)
11401/* Called by register_netdev() */ 11401/* Called by register_netdev() */
11402static int ipw_net_init(struct net_device *dev) 11402static int ipw_net_init(struct net_device *dev)
11403{ 11403{
11404 struct ipw_priv *priv = ieee80211_priv(dev); 11404 struct ipw_priv *priv = libipw_priv(dev);
11405 mutex_lock(&priv->mutex); 11405 mutex_lock(&priv->mutex);
11406 11406
11407 if (ipw_up(priv)) { 11407 if (ipw_up(priv)) {
@@ -11480,7 +11480,7 @@ static struct attribute_group ipw_attribute_group = {
11480#ifdef CONFIG_IPW2200_PROMISCUOUS 11480#ifdef CONFIG_IPW2200_PROMISCUOUS
11481static int ipw_prom_open(struct net_device *dev) 11481static int ipw_prom_open(struct net_device *dev)
11482{ 11482{
11483 struct ipw_prom_priv *prom_priv = ieee80211_priv(dev); 11483 struct ipw_prom_priv *prom_priv = libipw_priv(dev);
11484 struct ipw_priv *priv = prom_priv->priv; 11484 struct ipw_priv *priv = prom_priv->priv;
11485 11485
11486 IPW_DEBUG_INFO("prom dev->open\n"); 11486 IPW_DEBUG_INFO("prom dev->open\n");
@@ -11500,7 +11500,7 @@ static int ipw_prom_open(struct net_device *dev)
11500 11500
11501static int ipw_prom_stop(struct net_device *dev) 11501static int ipw_prom_stop(struct net_device *dev)
11502{ 11502{
11503 struct ipw_prom_priv *prom_priv = ieee80211_priv(dev); 11503 struct ipw_prom_priv *prom_priv = libipw_priv(dev);
11504 struct ipw_priv *priv = prom_priv->priv; 11504 struct ipw_priv *priv = prom_priv->priv;
11505 11505
11506 IPW_DEBUG_INFO("prom dev->stop\n"); 11506 IPW_DEBUG_INFO("prom dev->stop\n");
@@ -11528,7 +11528,7 @@ static const struct net_device_ops ipw_prom_netdev_ops = {
11528 .ndo_open = ipw_prom_open, 11528 .ndo_open = ipw_prom_open,
11529 .ndo_stop = ipw_prom_stop, 11529 .ndo_stop = ipw_prom_stop,
11530 .ndo_start_xmit = ipw_prom_hard_start_xmit, 11530 .ndo_start_xmit = ipw_prom_hard_start_xmit,
11531 .ndo_change_mtu = ieee80211_change_mtu, 11531 .ndo_change_mtu = libipw_change_mtu,
11532 .ndo_set_mac_address = eth_mac_addr, 11532 .ndo_set_mac_address = eth_mac_addr,
11533 .ndo_validate_addr = eth_validate_addr, 11533 .ndo_validate_addr = eth_validate_addr,
11534}; 11534};
@@ -11544,7 +11544,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)
11544 if (priv->prom_net_dev == NULL) 11544 if (priv->prom_net_dev == NULL)
11545 return -ENOMEM; 11545 return -ENOMEM;
11546 11546
11547 priv->prom_priv = ieee80211_priv(priv->prom_net_dev); 11547 priv->prom_priv = libipw_priv(priv->prom_net_dev);
11548 priv->prom_priv->ieee = netdev_priv(priv->prom_net_dev); 11548 priv->prom_priv->ieee = netdev_priv(priv->prom_net_dev);
11549 priv->prom_priv->priv = priv; 11549 priv->prom_priv->priv = priv;
11550 11550
@@ -11586,8 +11586,8 @@ static const struct net_device_ops ipw_netdev_ops = {
11586 .ndo_stop = ipw_net_stop, 11586 .ndo_stop = ipw_net_stop,
11587 .ndo_set_multicast_list = ipw_net_set_multicast_list, 11587 .ndo_set_multicast_list = ipw_net_set_multicast_list,
11588 .ndo_set_mac_address = ipw_net_set_mac_address, 11588 .ndo_set_mac_address = ipw_net_set_mac_address,
11589 .ndo_start_xmit = ieee80211_xmit, 11589 .ndo_start_xmit = libipw_xmit,
11590 .ndo_change_mtu = ieee80211_change_mtu, 11590 .ndo_change_mtu = libipw_change_mtu,
11591 .ndo_validate_addr = eth_validate_addr, 11591 .ndo_validate_addr = eth_validate_addr,
11592}; 11592};
11593 11593
@@ -11607,7 +11607,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
11607 goto out; 11607 goto out;
11608 } 11608 }
11609 11609
11610 priv = ieee80211_priv(net_dev); 11610 priv = libipw_priv(net_dev);
11611 priv->ieee = netdev_priv(net_dev); 11611 priv->ieee = netdev_priv(net_dev);
11612 11612
11613 priv->net_dev = net_dev; 11613 priv->net_dev = net_dev;
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-11 09:01:12 -0500