diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_common.h | 13 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 24 |
2 files changed, 12 insertions, 25 deletions
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h index b470c743c2d1..90b64b092007 100644 --- a/drivers/net/wireless/hostap/hostap_common.h +++ b/drivers/net/wireless/hostap/hostap_common.h | |||
@@ -6,19 +6,6 @@ | |||
6 | 6 | ||
7 | /* IEEE 802.11 defines */ | 7 | /* IEEE 802.11 defines */ |
8 | 8 | ||
9 | /* Information Element IDs */ | ||
10 | #define WLAN_EID_SSID 0 | ||
11 | #define WLAN_EID_SUPP_RATES 1 | ||
12 | #define WLAN_EID_FH_PARAMS 2 | ||
13 | #define WLAN_EID_DS_PARAMS 3 | ||
14 | #define WLAN_EID_CF_PARAMS 4 | ||
15 | #define WLAN_EID_TIM 5 | ||
16 | #define WLAN_EID_IBSS_PARAMS 6 | ||
17 | #define WLAN_EID_CHALLENGE 16 | ||
18 | #define WLAN_EID_RSN 48 | ||
19 | #define WLAN_EID_GENERIC 221 | ||
20 | |||
21 | |||
22 | /* HFA384X Configuration RIDs */ | 9 | /* HFA384X Configuration RIDs */ |
23 | #define HFA384X_RID_CNFPORTTYPE 0xFC00 | 10 | #define HFA384X_RID_CNFPORTTYPE 0xFC00 |
24 | #define HFA384X_RID_CNFOWNMACADDR 0xFC01 | 11 | #define HFA384X_RID_CNFOWNMACADDR 0xFC01 |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 2b9d96a5c10e..051ae92d8b65 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -4446,7 +4446,7 @@ static void ipw_rx_notification(struct ipw_priv *priv, | |||
4446 | 4446 | ||
4447 | #ifdef CONFIG_IPW2200_QOS | 4447 | #ifdef CONFIG_IPW2200_QOS |
4448 | #define IPW_GET_PACKET_STYPE(x) WLAN_FC_GET_STYPE( \ | 4448 | #define IPW_GET_PACKET_STYPE(x) WLAN_FC_GET_STYPE( \ |
4449 | le16_to_cpu(((struct ieee80211_hdr *)(x))->frame_ctl)) | 4449 | le16_to_cpu(((struct ieee80211_hdr *)(x))->frame_control)) |
4450 | if ((priv->status & STATUS_AUTH) && | 4450 | if ((priv->status & STATUS_AUTH) && |
4451 | (IPW_GET_PACKET_STYPE(¬if->u.raw) | 4451 | (IPW_GET_PACKET_STYPE(¬if->u.raw) |
4452 | == IEEE80211_STYPE_ASSOC_RESP)) { | 4452 | == IEEE80211_STYPE_ASSOC_RESP)) { |
@@ -7665,12 +7665,12 @@ static void ipw_rebuild_decrypted_skb(struct ipw_priv *priv, | |||
7665 | u16 fc; | 7665 | u16 fc; |
7666 | 7666 | ||
7667 | hdr = (struct ieee80211_hdr *)skb->data; | 7667 | hdr = (struct ieee80211_hdr *)skb->data; |
7668 | fc = le16_to_cpu(hdr->frame_ctl); | 7668 | fc = le16_to_cpu(hdr->frame_control); |
7669 | if (!(fc & IEEE80211_FCTL_PROTECTED)) | 7669 | if (!(fc & IEEE80211_FCTL_PROTECTED)) |
7670 | return; | 7670 | return; |
7671 | 7671 | ||
7672 | fc &= ~IEEE80211_FCTL_PROTECTED; | 7672 | fc &= ~IEEE80211_FCTL_PROTECTED; |
7673 | hdr->frame_ctl = cpu_to_le16(fc); | 7673 | hdr->frame_control = cpu_to_le16(fc); |
7674 | switch (priv->ieee->sec.level) { | 7674 | switch (priv->ieee->sec.level) { |
7675 | case SEC_LEVEL_3: | 7675 | case SEC_LEVEL_3: |
7676 | /* Remove CCMP HDR */ | 7676 | /* Remove CCMP HDR */ |
@@ -7982,17 +7982,17 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv, | |||
7982 | } | 7982 | } |
7983 | 7983 | ||
7984 | hdr = (void *)rxb->skb->data + IPW_RX_FRAME_SIZE; | 7984 | hdr = (void *)rxb->skb->data + IPW_RX_FRAME_SIZE; |
7985 | if (ieee80211_is_management(le16_to_cpu(hdr->frame_ctl))) { | 7985 | if (ieee80211_is_management(le16_to_cpu(hdr->frame_control))) { |
7986 | if (filter & IPW_PROM_NO_MGMT) | 7986 | if (filter & IPW_PROM_NO_MGMT) |
7987 | return; | 7987 | return; |
7988 | if (filter & IPW_PROM_MGMT_HEADER_ONLY) | 7988 | if (filter & IPW_PROM_MGMT_HEADER_ONLY) |
7989 | hdr_only = 1; | 7989 | hdr_only = 1; |
7990 | } else if (ieee80211_is_control(le16_to_cpu(hdr->frame_ctl))) { | 7990 | } else if (ieee80211_is_control(le16_to_cpu(hdr->frame_control))) { |
7991 | if (filter & IPW_PROM_NO_CTL) | 7991 | if (filter & IPW_PROM_NO_CTL) |
7992 | return; | 7992 | return; |
7993 | if (filter & IPW_PROM_CTL_HEADER_ONLY) | 7993 | if (filter & IPW_PROM_CTL_HEADER_ONLY) |
7994 | hdr_only = 1; | 7994 | hdr_only = 1; |
7995 | } else if (ieee80211_is_data(le16_to_cpu(hdr->frame_ctl))) { | 7995 | } else if (ieee80211_is_data(le16_to_cpu(hdr->frame_control))) { |
7996 | if (filter & IPW_PROM_NO_DATA) | 7996 | if (filter & IPW_PROM_NO_DATA) |
7997 | return; | 7997 | return; |
7998 | if (filter & IPW_PROM_DATA_HEADER_ONLY) | 7998 | if (filter & IPW_PROM_DATA_HEADER_ONLY) |
@@ -8010,7 +8010,7 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv, | |||
8010 | ipw_rt = (void *)skb->data; | 8010 | ipw_rt = (void *)skb->data; |
8011 | 8011 | ||
8012 | if (hdr_only) | 8012 | if (hdr_only) |
8013 | len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); | 8013 | len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control)); |
8014 | 8014 | ||
8015 | memcpy(ipw_rt->payload, hdr, len); | 8015 | memcpy(ipw_rt->payload, hdr, len); |
8016 | 8016 | ||
@@ -8230,7 +8230,7 @@ static int is_duplicate_packet(struct ipw_priv *priv, | |||
8230 | /* Comment this line now since we observed the card receives | 8230 | /* Comment this line now since we observed the card receives |
8231 | * duplicate packets but the FCTL_RETRY bit is not set in the | 8231 | * duplicate packets but the FCTL_RETRY bit is not set in the |
8232 | * IBSS mode with fragmentation enabled. | 8232 | * IBSS mode with fragmentation enabled. |
8233 | BUG_ON(!(le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_RETRY)); */ | 8233 | BUG_ON(!(le16_to_cpu(header->frame_control) & IEEE80211_FCTL_RETRY)); */ |
8234 | return 1; | 8234 | return 1; |
8235 | } | 8235 | } |
8236 | 8236 | ||
@@ -10381,17 +10381,17 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv, | |||
10381 | 10381 | ||
10382 | /* Filtering of fragment chains is done agains the first fragment */ | 10382 | /* Filtering of fragment chains is done agains the first fragment */ |
10383 | hdr = (void *)txb->fragments[0]->data; | 10383 | hdr = (void *)txb->fragments[0]->data; |
10384 | if (ieee80211_is_management(le16_to_cpu(hdr->frame_ctl))) { | 10384 | if (ieee80211_is_management(le16_to_cpu(hdr->frame_control))) { |
10385 | if (filter & IPW_PROM_NO_MGMT) | 10385 | if (filter & IPW_PROM_NO_MGMT) |
10386 | return; | 10386 | return; |
10387 | if (filter & IPW_PROM_MGMT_HEADER_ONLY) | 10387 | if (filter & IPW_PROM_MGMT_HEADER_ONLY) |
10388 | hdr_only = 1; | 10388 | hdr_only = 1; |
10389 | } else if (ieee80211_is_control(le16_to_cpu(hdr->frame_ctl))) { | 10389 | } else if (ieee80211_is_control(le16_to_cpu(hdr->frame_control))) { |
10390 | if (filter & IPW_PROM_NO_CTL) | 10390 | if (filter & IPW_PROM_NO_CTL) |
10391 | return; | 10391 | return; |
10392 | if (filter & IPW_PROM_CTL_HEADER_ONLY) | 10392 | if (filter & IPW_PROM_CTL_HEADER_ONLY) |
10393 | hdr_only = 1; | 10393 | hdr_only = 1; |
10394 | } else if (ieee80211_is_data(le16_to_cpu(hdr->frame_ctl))) { | 10394 | } else if (ieee80211_is_data(le16_to_cpu(hdr->frame_control))) { |
10395 | if (filter & IPW_PROM_NO_DATA) | 10395 | if (filter & IPW_PROM_NO_DATA) |
10396 | return; | 10396 | return; |
10397 | if (filter & IPW_PROM_DATA_HEADER_ONLY) | 10397 | if (filter & IPW_PROM_DATA_HEADER_ONLY) |
@@ -10406,7 +10406,7 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv, | |||
10406 | 10406 | ||
10407 | if (hdr_only) { | 10407 | if (hdr_only) { |
10408 | hdr = (void *)src->data; | 10408 | hdr = (void *)src->data; |
10409 | len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); | 10409 | len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control)); |
10410 | } else | 10410 | } else |
10411 | len = src->len; | 10411 | len = src->len; |
10412 | 10412 | ||