diff options
-rw-r--r-- | net/mac80211/wep.c | 19 | ||||
-rw-r--r-- | net/mac80211/wep.h | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c index 16fee142f984..6675261e958f 100644 --- a/net/mac80211/wep.c +++ b/net/mac80211/wep.c | |||
@@ -286,25 +286,6 @@ int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, | |||
286 | } | 286 | } |
287 | 287 | ||
288 | 288 | ||
289 | int ieee80211_wep_get_keyidx(struct sk_buff *skb) | ||
290 | { | ||
291 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | ||
292 | u16 fc; | ||
293 | int hdrlen; | ||
294 | |||
295 | fc = le16_to_cpu(hdr->frame_control); | ||
296 | if (!(fc & IEEE80211_FCTL_PROTECTED)) | ||
297 | return -1; | ||
298 | |||
299 | hdrlen = ieee80211_get_hdrlen(fc); | ||
300 | |||
301 | if (skb->len < 8 + hdrlen) | ||
302 | return -1; | ||
303 | |||
304 | return skb->data[hdrlen + 3] >> 6; | ||
305 | } | ||
306 | |||
307 | |||
308 | u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key) | 289 | u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key) |
309 | { | 290 | { |
310 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | 291 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; |
diff --git a/net/mac80211/wep.h b/net/mac80211/wep.h index da53190affc0..785fbb4e0dd7 100644 --- a/net/mac80211/wep.h +++ b/net/mac80211/wep.h | |||
@@ -26,7 +26,6 @@ int ieee80211_wep_encrypt(struct ieee80211_local *local, struct sk_buff *skb, | |||
26 | struct ieee80211_key *key); | 26 | struct ieee80211_key *key); |
27 | int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, | 27 | int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, |
28 | struct ieee80211_key *key); | 28 | struct ieee80211_key *key); |
29 | int ieee80211_wep_get_keyidx(struct sk_buff *skb); | ||
30 | u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key); | 29 | u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key); |
31 | 30 | ||
32 | ieee80211_txrx_result | 31 | ieee80211_txrx_result |