diff options
| author | Moritz Muehlenhoff <jmm@debian.org> | 2009-06-21 22:43:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:34 -0700 |
| commit | 84d9bd7d55fea1d1da364a4cdd9766f1b26aa747 (patch) | |
| tree | a506a6aa7a53e74630e755ee212ea3fe59fdaf79 /drivers/staging/wlan-ng | |
| parent | 2f5851917c7a2b29b0f73d974f241b9f8aaa62dd (diff) | |
| download | blackbird-op-linux-84d9bd7d55fea1d1da364a4cdd9766f1b26aa747.tar.gz blackbird-op-linux-84d9bd7d55fea1d1da364a4cdd9766f1b26aa747.zip | |
Staging: wlan-ng: Drop the special case handling of older wireless extensions, WIRELESS_EXT is at 22 for the current kernel.
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.c | 3 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211wext.c | 8 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index dd96a42bb72f..22424c8903ee 100644 --- 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 c3b42743df77..74d8022adb24 100644 --- 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--; |
