diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-09-26 15:19:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-11 01:53:14 +0200 |
| commit | af1a90da397f071d7ee893145a1e7b2124689376 (patch) | |
| tree | 28ba19f5cb9e2fddedc6dbe0d3b564faa6ec2aa6 /net/mac80211 | |
| parent | [PATCH] mac80211: consolidate encryption (diff) | |
| download | linux-af1a90da397f071d7ee893145a1e7b2124689376.tar.xz linux-af1a90da397f071d7ee893145a1e7b2124689376.zip | |
[PATCH] mac80211: remove ieee80211_wep_get_keyidx
This function is not used any more.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -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, } -int ieee80211_wep_get_keyidx(struct sk_buff *skb) -{ - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; - u16 fc; - int hdrlen; - - fc = le16_to_cpu(hdr->frame_control); - if (!(fc & IEEE80211_FCTL_PROTECTED)) - return -1; - - hdrlen = ieee80211_get_hdrlen(fc); - - if (skb->len < 8 + hdrlen) - return -1; - - return skb->data[hdrlen + 3] >> 6; -} - - u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key) { 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, struct ieee80211_key *key); int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, struct ieee80211_key *key); -int ieee80211_wep_get_keyidx(struct sk_buff *skb); u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key); ieee80211_txrx_result |