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

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index dd96a42bb72f9a8787e431a1292925fd2882dd61..22424c8903ee6b735946ff2ead5bf04284af533a 100644 (file)
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -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);

diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index c3b42743df778e3545096b46508690d4c1d340f5..74d8022adb24ae5a6b82de7a44f9c06608da0a46 100644 (file)
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -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--;