Staging: rtl8192su: remove support for older wireless extensions (3bd709f2) · Commits · jan.koester / Linux

drivers/staging/rtl8192su/ieee80211/ieee80211.h

+1 −15

Original line number	Diff line number	Diff line
		@@ -379,13 +379,11 @@ enum _ReasonCode{
		#define ieee80211_wx_get_scan ieee80211_wx_get_scan_rsl
		#define ieee80211_wx_set_encode ieee80211_wx_set_encode_rsl
		#define ieee80211_wx_get_encode ieee80211_wx_get_encode_rsl
		#if WIRELESS_EXT >= 18

		#define ieee80211_wx_set_mlme ieee80211_wx_set_mlme_rsl
		#define ieee80211_wx_set_auth ieee80211_wx_set_auth_rsl
		#define ieee80211_wx_set_encode_ext ieee80211_wx_set_encode_ext_rsl
		#define ieee80211_wx_get_encode_ext ieee80211_wx_get_encode_ext_rsl
		#endif


		typedef struct ieee_param {
		u32 cmd;
		@@ -416,16 +414,6 @@ typedef struct ieee_param {
		} u;
		}ieee_param;


		#if WIRELESS_EXT < 17
		#define IW_QUAL_QUAL_INVALID 0x10
		#define IW_QUAL_LEVEL_INVALID 0x20
		#define IW_QUAL_NOISE_INVALID 0x40
		#define IW_QUAL_QUAL_UPDATED 0x1
		#define IW_QUAL_LEVEL_UPDATED 0x2
		#define IW_QUAL_NOISE_UPDATED 0x4
		#endif

		#define MSECS(t) msecs_to_jiffies(t)
		#define msleep_interruptible_rsl msleep_interruptible

		@@ -2552,7 +2540,6 @@ 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 >= 18
		extern int ieee80211_wx_get_encode_ext(struct ieee80211_device *ieee,
		struct iw_request_info *info,
		union iwreq_data* wrqu, char *extra);
		@@ -2565,7 +2552,6 @@ extern int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
		extern int ieee80211_wx_set_mlme(struct ieee80211_device *ieee,
		struct iw_request_info *info,
		union iwreq_data wrqu, char extra);
		#endif
		extern int ieee80211_wx_set_gen_ie(struct ieee80211_device ieee, u8 ie, size_t len);

		/* ieee80211_softmac.c */

drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c

+0 −25

Original line number	Diff line number	Diff line
		@@ -615,8 +615,6 @@ static int ieee80211_michael_mic_add(struct sk_buff skb, int hdr_len, void pri
		return 0;
		}


		#if WIRELESS_EXT >= 18
		static void ieee80211_michael_mic_failure(struct net_device *dev,
		struct ieee80211_hdr_4addr *hdr,
		int keyidx)
		@@ -637,29 +635,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)

drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -986,7 +986,6 @@ int ieee80211_rx(struct ieee80211_device ieee, struct sk_buff skb,

		//IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len);
		#ifdef NOT_YET
		#if WIRELESS_EXT > 15
		/* Put this code here so that we avoid duplicating it in all
		* Rx paths. - Jean II */
		#ifdef IW_WIRELESS_SPY /* defined in iw_handler.h */
		@@ -1000,18 +999,16 @@ int ieee80211_rx(struct ieee80211_device ieee, struct sk_buff skb,
		wireless_spy_update(dev, hdr->addr2, &wstats);
		}
		#endif /* IW_WIRELESS_SPY */
		#endif /* WIRELESS_EXT > 15 */
		hostap_update_rx_stats(local->ap, hdr, rx_stats);
		#endif

		#if WIRELESS_EXT > 15
		if (ieee->iw_mode == IW_MODE_MONITOR) {
		ieee80211_monitor_rx(ieee, skb, rx_stats);
		stats->rx_packets++;
		stats->rx_bytes += skb->len;
		return 1;
		}
		#endif

		if (ieee->host_decrypt) {
		int idx = 0;
		if (skb->len >= hdrlen + 3)

drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c

+2 −36

Original line number	Diff line number	Diff line
		@@ -211,37 +211,7 @@ static inline char rtl819x_translate_scan(struct ieee80211_device ieee,
		iwe.u.data.length = p - custom;
		if (iwe.u.data.length)
		start = iwe_stream_add_point(info, start, stop, &iwe, custom);
		#if (WIRELESS_EXT < 18)
		if (ieee->wpa_enabled && network->wpa_ie_len){
		char buf[MAX_WPA_IE_LEN * 2 + 30];
		// printk("WPA IE\n");
		u8 *p = buf;
		p += sprintf(p, "wpa_ie=");
		for (i = 0; i < network->wpa_ie_len; i++) {
		p += sprintf(p, "%02x", network->wpa_ie[i]);
		}

		memset(&iwe, 0, sizeof(iwe));
		iwe.cmd = IWEVCUSTOM;
		iwe.u.data.length = strlen(buf);
		start = iwe_stream_add_point(info, start, stop, &iwe, buf);
		}

		if (ieee->wpa_enabled && network->rsn_ie_len){
		char buf[MAX_WPA_IE_LEN * 2 + 30];

		u8 *p = buf;
		p += sprintf(p, "rsn_ie=");
		for (i = 0; i < network->rsn_ie_len; i++) {
		p += sprintf(p, "%02x", network->rsn_ie[i]);
		}

		memset(&iwe, 0, sizeof(iwe));
		iwe.cmd = IWEVCUSTOM;
		iwe.u.data.length = strlen(buf);
		start = iwe_stream_add_point(info, start, stop, &iwe, buf);
		}
		#else
		memset(&iwe, 0, sizeof(iwe));
		if (network->wpa_ie_len)
		{
		@@ -260,8 +230,6 @@ static inline char rtl819x_translate_scan(struct ieee80211_device ieee,
		iwe.u.data.length = network->rsn_ie_len;
		start = iwe_stream_add_point(info, start, stop, &iwe, buf);
		}
		#endif


		/* Add EXTRA: Age to display seconds since last beacon/probe response
		* for given network. */
		@@ -548,7 +516,7 @@ int ieee80211_wx_get_encode(struct ieee80211_device *ieee,

		return 0;
		}
		#if (WIRELESS_EXT >= 18)

		int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
		struct iw_request_info *info,
		union iwreq_data wrqu, char extra)
		@@ -869,7 +837,7 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,

		return 0;
		}
		#endif

		#if 1
		int ieee80211_wx_set_gen_ie(struct ieee80211_device ieee, u8 ie, size_t len)
		{
		@@ -919,12 +887,10 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device ieee, u8 ie, size_t len)
		#endif

		EXPORT_SYMBOL(ieee80211_wx_set_gen_ie);
		#if (WIRELESS_EXT >= 18)
		EXPORT_SYMBOL(ieee80211_wx_set_mlme);
		EXPORT_SYMBOL(ieee80211_wx_set_auth);
		EXPORT_SYMBOL(ieee80211_wx_set_encode_ext);
		EXPORT_SYMBOL(ieee80211_wx_get_encode_ext);
		#endif
		EXPORT_SYMBOL(ieee80211_wx_get_scan);
		EXPORT_SYMBOL(ieee80211_wx_set_encode);
		EXPORT_SYMBOL(ieee80211_wx_get_encode);

drivers/staging/rtl8192su/r8192U_core.c

+1 −15

Original line number	Diff line number	Diff line
		@@ -1245,17 +1245,7 @@ static int proc_get_stats_rx(char page, char *start,
		*eof = 1;
		return len;
		}
		#if 0
		#if WIRELESS_EXT >= 12 && WIRELESS_EXT < 17

		static struct iw_statistics r8192_get_wireless_stats(struct net_device dev)
		{
		struct r8192_priv *priv = ieee80211_priv(dev);

		return &priv->wstats;
		}
		#endif
		#endif
		void rtl8192_proc_module_init(void)
		{
		RT_TRACE(COMP_INIT, "Initializing proc filesystem");
		@@ -11874,12 +11864,8 @@ static int __devinit rtl8192_usb_probe(struct usb_interface *intf,
		dev->netdev_ops = &rtl8192_netdev_ops;

		//DMESG("Oops: i'm coming\n");
		#if WIRELESS_EXT >= 12
		#if WIRELESS_EXT < 17
		dev->get_wireless_stats = r8192_get_wireless_stats;
		#endif
		dev->wireless_handlers = (struct iw_handler_def *) &r8192_wx_handlers_def;
		#endif

		dev->type=ARPHRD_ETHER;

		dev->watchdog_timeo = HZ*3; //modified by john, 0805