diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-20 17:24:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-20 17:24:29 -0800 |
| commit | 53438e5d04f156dc36ff5cf44740262205bfb206 (patch) | |
| tree | ddc33d943e84111db315647b7dc2118422b2dd6b /net/ieee80211/ieee80211_crypt_tkip.c | |
| parent | 1f305323ff5b9ddc1a4346d36072bcdb58f3f68a (diff) | |
| parent | 92468c53cf5af0aea06caec7b7d416c18e973685 (diff) | |
| download | talos-op-linux-53438e5d04f156dc36ff5cf44740262205bfb206.tar.gz talos-op-linux-53438e5d04f156dc36ff5cf44740262205bfb206.zip | |
Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/ieee80211/ieee80211_crypt_tkip.c')
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_tkip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c index 58b22619ab15..8e146949fc6f 100644 --- a/net/ieee80211/ieee80211_crypt_tkip.c +++ b/net/ieee80211/ieee80211_crypt_tkip.c @@ -464,7 +464,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) pos += 8; if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) { - if (net_ratelimit()) { + if (ieee80211_ratelimit_debug(IEEE80211_DL_DROP)) { IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=%s" " previous TSC %08x%04x received TSC " "%08x%04x\n", print_mac(mac, hdr->addr2), @@ -504,7 +504,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) * it needs to be recalculated for the next packet. */ tkey->rx_phase1_done = 0; } - if (net_ratelimit()) { + if (ieee80211_ratelimit_debug(IEEE80211_DL_DROP)) { IEEE80211_DEBUG_DROP("TKIP: ICV error detected: STA=" "%s\n", print_mac(mac, hdr->addr2)); } |
