Commit 9a01c16b authored by James Ketrenos's avatar James Ketrenos Committed by Jeff Garzik
Browse files

[PATCH] ieee82011: Remove WIRELESS_EXT ifdefs 



Remove old WIRELESS_EXT version compatibility

In-tree doesn't need to maintain backward compatibility.

Signed-off-by: default avatarJames Ketrenos <jketreno@linux.intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 5bfc819b

include/net/ieee80211.h

+0 −2
Original line number Diff line number Diff line
@@ -1069,14 +1069,12 @@ extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee, 
extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,

				   struct iw_request_info *info,

				   union iwreq_data *wrqu, char *key);

#if WIRELESS_EXT > 17

extern int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,

				      struct iw_request_info *info,

				      union iwreq_data *wrqu, char *extra);

extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,

				      struct iw_request_info *info,

				      union iwreq_data *wrqu, char *extra);

#endif



static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)

{

net/ieee80211/ieee80211_crypt_tkip.c

+0 −23
Original line number Diff line number Diff line
@@ -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)

net/ieee80211/ieee80211_wx.c

+0 −2
Original line number Diff line number Diff line
@@ -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);