2 files changed, 0 insertions, 25 deletions

diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index f973d6cb8248..21022f195bab 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -515,7 +515,6 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len,
         return 0;
 }
 
-#if WIRELESS_EXT >= 18
 static void ieee80211_michael_mic_failure(struct net_device *dev,
                                           struct ieee80211_hdr_4addr *hdr,
                                           int keyidx)
@@ -536,28 +535,6 @@ static void ieee80211_michael_mic_failure(struct net_device *dev,
         wrqu.data.length = sizeof(ev);
         wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *)&ev);
 }
-#elif WIRELESS_EXT >= 15
-static void ieee80211_michael_mic_failure(struct net_device *dev,
-                                          struct ieee80211_hdr_4addr *hdr,
-                                          int keyidx)
-{
-        union iwreq_data wrqu;
-        char buf[128];
-
-        /* TODO: needed parameters: count, keyid, key type, TSC */
-        sprintf(buf, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr="
-                MAC_FMT ")", keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni",
-                MAC_ARG(hdr->addr2));
-        memset(&wrqu, 0, sizeof(wrqu));
-        wrqu.data.length = strlen(buf);
-        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-}
-#else                           /* WIRELESS_EXT >= 15 */
-static inline void ieee80211_michael_mic_failure(struct net_device *dev, struct ieee80211_hdr_4addr
-                                                 *hdr, int keyidx)
-{
-}
-#endif                          /* WIRELESS_EXT >= 15 */
 
 static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
                                         int hdr_len, void *priv)
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index e28648e70cf1..3dd2bbae0c24 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -488,7 +488,6 @@ int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
         return 0;
 }
 
-#if WIRELESS_EXT > 17
 int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
                                struct iw_request_info *info,
                                union iwreq_data *wrqu, char *extra)
@@ -722,7 +721,6 @@ int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
 
 EXPORT_SYMBOL(ieee80211_wx_set_encodeext);
 EXPORT_SYMBOL(ieee80211_wx_get_encodeext);
-#endif
 
 EXPORT_SYMBOL(ieee80211_wx_get_scan);
 EXPORT_SYMBOL(ieee80211_wx_set_encode);