diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-25 20:59:10 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-25 20:59:10 -0400 |
commit | 831a179fc9387af6dbaa12816ae1e074d1f1a730 (patch) | |
tree | efb3ea5fc390e7cefdaadb535dc166319ac6f69d /drivers/net/wireless/hostap/hostap_80211_rx.c | |
parent | b4bf343093e81e33d75bede45896eda52cd5f2b4 (diff) |
hostap: s/IEEE80211_FCTL_WEP/IEEE80211_FCTL_PROTECTED/ to fix build
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_80211_rx.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_80211_rx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c index 051a59075ea8..b0501243b175 100644 --- a/drivers/net/wireless/hostap/hostap_80211_rx.c +++ b/drivers/net/wireless/hostap/hostap_80211_rx.c | |||
@@ -773,7 +773,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
773 | crypt->ops->decrypt_mpdu == NULL)) | 773 | crypt->ops->decrypt_mpdu == NULL)) |
774 | crypt = NULL; | 774 | crypt = NULL; |
775 | 775 | ||
776 | if (!crypt && (fc & IEEE80211_FCTL_WEP)) { | 776 | if (!crypt && (fc & IEEE80211_FCTL_PROTECTED)) { |
777 | #if 0 | 777 | #if 0 |
778 | /* This seems to be triggered by some (multicast?) | 778 | /* This seems to be triggered by some (multicast?) |
779 | * frames from other than current BSS, so just drop the | 779 | * frames from other than current BSS, so just drop the |
@@ -791,7 +791,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
791 | if (type != IEEE80211_FTYPE_DATA) { | 791 | if (type != IEEE80211_FTYPE_DATA) { |
792 | if (type == IEEE80211_FTYPE_MGMT && | 792 | if (type == IEEE80211_FTYPE_MGMT && |
793 | stype == IEEE80211_STYPE_AUTH && | 793 | stype == IEEE80211_STYPE_AUTH && |
794 | fc & IEEE80211_FCTL_WEP && local->host_decrypt && | 794 | fc & IEEE80211_FCTL_PROTECTED && local->host_decrypt && |
795 | (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0) | 795 | (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0) |
796 | { | 796 | { |
797 | printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " | 797 | printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " |
@@ -886,14 +886,14 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
886 | 886 | ||
887 | /* skb: hdr + (possibly fragmented, possibly encrypted) payload */ | 887 | /* skb: hdr + (possibly fragmented, possibly encrypted) payload */ |
888 | 888 | ||
889 | if (local->host_decrypt && (fc & IEEE80211_FCTL_WEP) && | 889 | if (local->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) && |
890 | (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0) | 890 | (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0) |
891 | goto rx_dropped; | 891 | goto rx_dropped; |
892 | hdr = (struct ieee80211_hdr *) skb->data; | 892 | hdr = (struct ieee80211_hdr *) skb->data; |
893 | 893 | ||
894 | /* skb: hdr + (possibly fragmented) plaintext payload */ | 894 | /* skb: hdr + (possibly fragmented) plaintext payload */ |
895 | 895 | ||
896 | if (local->host_decrypt && (fc & IEEE80211_FCTL_WEP) && | 896 | if (local->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) && |
897 | (frag != 0 || (fc & IEEE80211_FCTL_MOREFRAGS))) { | 897 | (frag != 0 || (fc & IEEE80211_FCTL_MOREFRAGS))) { |
898 | int flen; | 898 | int flen; |
899 | struct sk_buff *frag_skb = | 899 | struct sk_buff *frag_skb = |
@@ -948,12 +948,12 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
948 | /* skb: hdr + (possible reassembled) full MSDU payload; possibly still | 948 | /* skb: hdr + (possible reassembled) full MSDU payload; possibly still |
949 | * encrypted/authenticated */ | 949 | * encrypted/authenticated */ |
950 | 950 | ||
951 | if (local->host_decrypt && (fc & IEEE80211_FCTL_WEP) && | 951 | if (local->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) && |
952 | hostap_rx_frame_decrypt_msdu(local, skb, keyidx, crypt)) | 952 | hostap_rx_frame_decrypt_msdu(local, skb, keyidx, crypt)) |
953 | goto rx_dropped; | 953 | goto rx_dropped; |
954 | 954 | ||
955 | hdr = (struct ieee80211_hdr *) skb->data; | 955 | hdr = (struct ieee80211_hdr *) skb->data; |
956 | if (crypt && !(fc & IEEE80211_FCTL_WEP) && !local->open_wep) { | 956 | if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !local->open_wep) { |
957 | if (local->ieee_802_1x && | 957 | if (local->ieee_802_1x && |
958 | hostap_is_eapol_frame(local, skb)) { | 958 | hostap_is_eapol_frame(local, skb)) { |
959 | /* pass unencrypted EAPOL frames even if encryption is | 959 | /* pass unencrypted EAPOL frames even if encryption is |
@@ -968,7 +968,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, | |||
968 | } | 968 | } |
969 | } | 969 | } |
970 | 970 | ||
971 | if (local->drop_unencrypted && !(fc & IEEE80211_FCTL_WEP) && | 971 | if (local->drop_unencrypted && !(fc & IEEE80211_FCTL_PROTECTED) && |
972 | !hostap_is_eapol_frame(local, skb)) { | 972 | !hostap_is_eapol_frame(local, skb)) { |
973 | if (net_ratelimit()) { | 973 | if (net_ratelimit()) { |
974 | printk(KERN_DEBUG "%s: dropped unencrypted RX data " | 974 | printk(KERN_DEBUG "%s: dropped unencrypted RX data " |