1 files changed, 0 insertions, 14 deletions

diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index 1a09448016ed..435ef5a73d75 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -157,20 +157,6 @@ static inline int ieee80211_encrypt_fragment(struct ieee80211_device *ieee,
         struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx];
         int res;
 
-#ifdef CONFIG_IEEE80211_CRYPT_TKIP
-        struct ieee80211_hdr *header;
-
-        if (ieee->tkip_countermeasures &&
-            crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {
-                header = (struct ieee80211_hdr *)frag->data;
-                if (net_ratelimit()) {
-                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
-                               "TX packet to " MAC_FMT "\n",
-                               ieee->dev->name, MAC_ARG(header->addr1));
-                }
-                return -1;
-        }
-#endif
         /* To encrypt, frame format is:
          * IV (4 bytes), clear payload (including SNAP), ICV (4 bytes) */