Skip to content

Commit

Permalink
Staging: wlan-ng: Drop the special case handling of older wireless ex…
Browse files Browse the repository at this point in the history
…tensions, 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>
  • Loading branch information
Moritz Muehlenhoff authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 2f58519 commit 84d9bd7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
3 changes: 0 additions & 3 deletions drivers/staging/wlan-ng/p80211netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 0 additions & 8 deletions drivers/staging/wlan-ng/p80211wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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--;
Expand Down

0 comments on commit 84d9bd7

Please sign in to comment.