Commit 84d9bd7d authored by Moritz Muehlenhoff's avatar Moritz Muehlenhoff Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: Drop the special case handling of older wireless extensions,... 


Staging: wlan-ng: Drop the special case handling of older wireless extensions, WIRELESS_EXT is at 22 for the current kernel.

Signed-off-by: default avatarMoritz Muehlenhoff <jmm@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2f585191

drivers/staging/wlan-ng/p80211netdev.c

+0 −3
Original line number Diff line number Diff line
@@ -764,9 +764,6 @@ int wlan_setup(wlandevice_t *wlandev) 
		dev->ml_priv = wlandev;

		dev->netdev_ops = &p80211_netdev_ops;



#if (WIRELESS_EXT < 21)

		dev->get_wireless_stats = p80211wext_get_wireless_stats;

#endif

		dev->wireless_handlers = &p80211wext_handler_def;



		netif_stop_queue(dev);

drivers/staging/wlan-ng/p80211wext.c

+0 −8
Original line number Diff line number Diff line
@@ -689,9 +689,6 @@ static int p80211wext_giwessid(netdevice_t *dev, 
		data->flags = 1;

		memcpy(essid, wlandev->ssid.data, data->length);

		essid[data->length] = 0;

#if (WIRELESS_EXT < 21)

		data->length++;

#endif

	} else {

		memset(essid, 0, sizeof(wlandev->ssid.data));

		data->length = 0;
@@ -724,11 +721,6 @@ static int p80211wext_siwessid(netdevice_t *dev, 


	msg.msgcode = DIDmsg_lnxreq_autojoin;



#if (WIRELESS_EXT < 21)

	if (length)

		length--;

#endif



	/* Trim the last '\0' to fit the SSID format */

	if (length && essid[length - 1] == '\0')

		length--;