aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-09-21 12:58:29 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-21 23:04:57 -0400
commit42c94e43be27f8b9be9b5be491bae8af05e54dbd (patch)
tree83ec8abd98a18e1539c6b99979f11b5d6c3341bc /net
parent9ba7e0d1579485ce231594651b39c169029f5d67 (diff)
[PATCH] ieee80211: Type-o, capbility definition for QoS, and ERP parsing
tree 3ac0dd07b9972dfd68fee47ec2152d3d378de000 parent 9ada1d971d9829c34a14d98840080b7e69fdff6b author Mohamed Abbad <mohamed.abbas@intel.com> 1126054379 -0500 committer James Ketrenos <jketreno@linux.intel.com> 1127314340 -0500 Type-o, capbility definition for QoS, and ERP parsing Added WLAN_CAPABILITY_QOS Fixed type-o WLAN_CAPABILITY_OSSS_OFDM -> WLAN_CAPABILITY_DSSS_OFDM Added ERP IE parsing to ieee80211_rx Added handle_probe_request callback. Signed-off-by: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'net')
-rw-r--r--net/ieee80211/ieee80211_rx.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 2c4613527dfd..8bcdbabae3a1 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1065,6 +1065,8 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i
1065 network->ssid_len = 0; 1065 network->ssid_len = 0;
1066 network->flags = 0; 1066 network->flags = 0;
1067 network->atim_window = 0; 1067 network->atim_window = 0;
1068 network->erp_value = (network->capability & WLAN_CAPABILITY_IBSS) ?
1069 0x3 : 0x0;
1068 1070
1069 if (stats->freq == IEEE80211_52GHZ_BAND) { 1071 if (stats->freq == IEEE80211_52GHZ_BAND) {
1070 /* for A band (No DS info) */ 1072 /* for A band (No DS info) */
@@ -1178,8 +1180,16 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i
1178 IEEE80211_DEBUG_SCAN("MFIE_TYPE_TIM: ignored\n"); 1180 IEEE80211_DEBUG_SCAN("MFIE_TYPE_TIM: ignored\n");
1179 break; 1181 break;
1180 1182
1183 case MFIE_TYPE_ERP_INFO:
1184 network->erp_value = info_element->data[0];
1185 IEEE80211_DEBUG_SCAN("MFIE_TYPE_ERP_SET: %d\n",
1186 network->erp_value);
1187 break;
1188
1181 case MFIE_TYPE_IBSS_SET: 1189 case MFIE_TYPE_IBSS_SET:
1182 IEEE80211_DEBUG_SCAN("MFIE_TYPE_IBSS_SET: ignored\n"); 1190 network->atim_window = info_element->data[0];
1191 IEEE80211_DEBUG_SCAN("MFIE_TYPE_IBSS_SET: %d\n",
1192 network->atim_window);
1183 break; 1193 break;
1184 1194
1185 case MFIE_TYPE_CHALLENGE: 1195 case MFIE_TYPE_CHALLENGE:
@@ -1290,6 +1300,7 @@ static inline void update_network(struct ieee80211_network *dst,
1290 dst->beacon_interval = src->beacon_interval; 1300 dst->beacon_interval = src->beacon_interval;
1291 dst->listen_interval = src->listen_interval; 1301 dst->listen_interval = src->listen_interval;
1292 dst->atim_window = src->atim_window; 1302 dst->atim_window = src->atim_window;
1303 dst->erp_value = src->erp_value;
1293 1304
1294 memcpy(dst->wpa_ie, src->wpa_ie, src->wpa_ie_len); 1305 memcpy(dst->wpa_ie, src->wpa_ie, src->wpa_ie_len);
1295 dst->wpa_ie_len = src->wpa_ie_len; 1306 dst->wpa_ie_len = src->wpa_ie_len;
@@ -1471,6 +1482,18 @@ void ieee80211_rx_mgt(struct ieee80211_device *ieee,
1471 (header->frame_ctl))); 1482 (header->frame_ctl)));
1472 break; 1483 break;
1473 1484
1485 case IEEE80211_STYPE_PROBE_REQ:
1486 IEEE80211_DEBUG_MGMT("recieved auth (%d)\n",
1487 WLAN_FC_GET_STYPE(le16_to_cpu
1488 (header->frame_ctl)));
1489
1490 if (ieee->handle_probe_request != NULL)
1491 ieee->handle_probe_request(ieee->dev,
1492 (struct
1493 ieee80211_probe_request *)
1494 header, stats);
1495 break;
1496
1474 case IEEE80211_STYPE_PROBE_RESP: 1497 case IEEE80211_STYPE_PROBE_RESP:
1475 IEEE80211_DEBUG_MGMT("received PROBE RESPONSE (%d)\n", 1498 IEEE80211_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",
1476 WLAN_FC_GET_STYPE(le16_to_cpu 1499 WLAN_FC_GET_STYPE(le16_to_cpu