diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 06:41:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 06:41:53 +0200 |
| commit | f3032be921cd126615ce3bfd7084e3d319f3f892 (patch) | |
| tree | c2ce874f2ab7f107dddf7b854772e0f3b64d35a1 /net/mac80211/wep.c | |
| parent | vlan: Add GVRP support (diff) | |
| parent | p54: Add quality output to iwlist and iwconfig (diff) | |
| download | linux-f3032be921cd126615ce3bfd7084e3d319f3f892.tar.xz linux-f3032be921cd126615ce3bfd7084e3d319f3f892.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/wep.c')
| -rw-r--r-- | net/mac80211/wep.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c index 35b664d00e23..872d2fcd1a5b 100644 --- a/net/mac80211/wep.c +++ b/net/mac80211/wep.c @@ -253,11 +253,8 @@ int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, if (ieee80211_wep_decrypt_data(local->wep_rx_tfm, rc4key, klen, skb->data + hdrlen + WEP_IV_LEN, - len)) { - if (net_ratelimit()) - printk(KERN_DEBUG "WEP decrypt failed (ICV)\n"); + len)) ret = -1; - } kfree(rc4key); @@ -301,14 +298,8 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx) return RX_CONTINUE; if (!(rx->status->flag & RX_FLAG_DECRYPTED)) { - if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key)) { -#ifdef CONFIG_MAC80211_DEBUG - if (net_ratelimit()) - printk(KERN_DEBUG "%s: RX WEP frame, decrypt " - "failed\n", rx->dev->name); -#endif /* CONFIG_MAC80211_DEBUG */ + if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key)) return RX_DROP_UNUSABLE; - } } else if (!(rx->status->flag & RX_FLAG_IV_STRIPPED)) { ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key); /* remove ICV */ |