diff options
Diffstat (limited to 'drivers/staging/wlan-ng/p80211wext.c')
-rw-r--r-- | drivers/staging/wlan-ng/p80211wext.c | 77 |
1 files changed, 33 insertions, 44 deletions
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c index 984e45d9f700..74d8022adb24 100644 --- a/drivers/staging/wlan-ng/p80211wext.c +++ b/drivers/staging/wlan-ng/p80211wext.c @@ -52,9 +52,6 @@ #include <linux/if_ether.h> #include <linux/bitops.h> -/*================================================================*/ -/* Project Includes */ - #include "p80211types.h" #include "p80211hdr.h" #include "p80211conv.h" @@ -66,10 +63,10 @@ #include "p80211ioctl.h" #include "p80211req.h" -static int p80211wext_giwrate(netdevice_t * dev, +static int p80211wext_giwrate(netdevice_t *dev, struct iw_request_info *info, struct iw_param *rrq, char *extra); -static int p80211wext_giwessid(netdevice_t * dev, +static int p80211wext_giwessid(netdevice_t *dev, struct iw_request_info *info, struct iw_point *data, char *essid); @@ -130,7 +127,7 @@ static int qual_as_percent(int snr) return 100; } -static int p80211wext_dorequest(wlandevice_t * wlandev, u32 did, u32 data) +static int p80211wext_dorequest(wlandevice_t *wlandev, u32 did, u32 data) { p80211msg_dot11req_mibset_t msg; p80211item_uint32_t mibitem; @@ -145,7 +142,7 @@ static int p80211wext_dorequest(wlandevice_t * wlandev, u32 did, u32 data) return result; } -static int p80211wext_autojoin(wlandevice_t * wlandev) +static int p80211wext_autojoin(wlandevice_t *wlandev) { p80211msg_lnxreq_autojoin_t msg; struct iw_point data; @@ -191,7 +188,7 @@ exit: } /* called by /proc/net/wireless */ -struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t * dev) +struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t *dev) { p80211msg_lnxreq_commsquality_t quality; wlandevice_t *wlandev = dev->ml_priv; @@ -232,7 +229,7 @@ struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t * dev) return wstats; } -static int p80211wext_giwname(netdevice_t * dev, +static int p80211wext_giwname(netdevice_t *dev, struct iw_request_info *info, char *name, char *extra) { @@ -261,7 +258,7 @@ exit: return err; } -static int p80211wext_giwfreq(netdevice_t * dev, +static int p80211wext_giwfreq(netdevice_t *dev, struct iw_request_info *info, struct iw_freq *freq, char *extra) { @@ -296,7 +293,7 @@ exit: return err; } -static int p80211wext_siwfreq(netdevice_t * dev, +static int p80211wext_siwfreq(netdevice_t *dev, struct iw_request_info *info, struct iw_freq *freq, char *extra) { @@ -332,9 +329,9 @@ exit: return err; } -static int p80211wext_giwmode(netdevice_t * dev, +static int p80211wext_giwmode(netdevice_t *dev, struct iw_request_info *info, - __u32 * mode, char *extra) + __u32 *mode, char *extra) { wlandevice_t *wlandev = dev->ml_priv; @@ -356,9 +353,9 @@ static int p80211wext_giwmode(netdevice_t * dev, return 0; } -static int p80211wext_siwmode(netdevice_t * dev, +static int p80211wext_siwmode(netdevice_t *dev, struct iw_request_info *info, - __u32 * mode, char *extra) + __u32 *mode, char *extra) { wlandevice_t *wlandev = dev->ml_priv; p80211item_uint32_t mibitem; @@ -411,7 +408,7 @@ exit: return err; } -static int p80211wext_giwrange(netdevice_t * dev, +static int p80211wext_giwrange(netdevice_t *dev, struct iw_request_info *info, struct iw_point *data, char *extra) { @@ -480,7 +477,7 @@ static int p80211wext_giwrange(netdevice_t * dev, return 0; } -static int p80211wext_giwap(netdevice_t * dev, +static int p80211wext_giwap(netdevice_t *dev, struct iw_request_info *info, struct sockaddr *ap_addr, char *extra) { @@ -493,7 +490,7 @@ static int p80211wext_giwap(netdevice_t * dev, return 0; } -static int p80211wext_giwencode(netdevice_t * dev, +static int p80211wext_giwencode(netdevice_t *dev, struct iw_request_info *info, struct iw_point *erq, char *key) { @@ -534,7 +531,7 @@ exit: return err; } -static int p80211wext_siwencode(netdevice_t * dev, +static int p80211wext_siwencode(netdevice_t *dev, struct iw_request_info *info, struct iw_point *erq, char *key) { @@ -681,7 +678,7 @@ exit: return err; } -static int p80211wext_giwessid(netdevice_t * dev, +static int p80211wext_giwessid(netdevice_t *dev, struct iw_request_info *info, struct iw_point *data, char *essid) { @@ -692,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; @@ -704,7 +698,7 @@ static int p80211wext_giwessid(netdevice_t * dev, return 0; } -static int p80211wext_siwessid(netdevice_t * dev, +static int p80211wext_siwessid(netdevice_t *dev, struct iw_request_info *info, struct iw_point *data, char *essid) { @@ -727,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--; @@ -752,7 +741,7 @@ exit: return err; } -static int p80211wext_siwcommit(netdevice_t * dev, +static int p80211wext_siwcommit(netdevice_t *dev, struct iw_request_info *info, struct iw_point *data, char *essid) { @@ -771,7 +760,7 @@ exit: return err; } -static int p80211wext_giwrate(netdevice_t * dev, +static int p80211wext_giwrate(netdevice_t *dev, struct iw_request_info *info, struct iw_param *rrq, char *extra) { @@ -822,7 +811,7 @@ exit: return err; } -static int p80211wext_giwrts(netdevice_t * dev, +static int p80211wext_giwrts(netdevice_t *dev, struct iw_request_info *info, struct iw_param *rts, char *extra) { @@ -852,7 +841,7 @@ exit: return err; } -static int p80211wext_siwrts(netdevice_t * dev, +static int p80211wext_siwrts(netdevice_t *dev, struct iw_request_info *info, struct iw_param *rts, char *extra) { @@ -886,7 +875,7 @@ exit: return err; } -static int p80211wext_giwfrag(netdevice_t * dev, +static int p80211wext_giwfrag(netdevice_t *dev, struct iw_request_info *info, struct iw_param *frag, char *extra) { @@ -917,7 +906,7 @@ exit: return err; } -static int p80211wext_siwfrag(netdevice_t * dev, +static int p80211wext_siwfrag(netdevice_t *dev, struct iw_request_info *info, struct iw_param *frag, char *extra) { @@ -961,7 +950,7 @@ exit: #define IW_RETRY_SHORT IW_RETRY_MIN #endif -static int p80211wext_giwretry(netdevice_t * dev, +static int p80211wext_giwretry(netdevice_t *dev, struct iw_request_info *info, struct iw_param *rrq, char *extra) { @@ -1038,7 +1027,7 @@ exit: } -static int p80211wext_siwretry(netdevice_t * dev, +static int p80211wext_siwretry(netdevice_t *dev, struct iw_request_info *info, struct iw_param *rrq, char *extra) { @@ -1109,7 +1098,7 @@ exit: } -static int p80211wext_siwtxpow(netdevice_t * dev, +static int p80211wext_siwtxpow(netdevice_t *dev, struct iw_request_info *info, struct iw_param *rrq, char *extra) { @@ -1143,7 +1132,7 @@ exit: return err; } -static int p80211wext_giwtxpow(netdevice_t * dev, +static int p80211wext_giwtxpow(netdevice_t *dev, struct iw_request_info *info, struct iw_param *rrq, char *extra) { @@ -1178,7 +1167,7 @@ exit: return err; } -static int p80211wext_siwspy(netdevice_t * dev, +static int p80211wext_siwspy(netdevice_t *dev, struct iw_request_info *info, struct iw_point *srq, char *extra) { @@ -1213,7 +1202,7 @@ static int p80211wext_siwspy(netdevice_t * dev, } /* jkriegl: from orinoco, modified */ -static int p80211wext_giwspy(netdevice_t * dev, +static int p80211wext_giwspy(netdevice_t *dev, struct iw_request_info *info, struct iw_point *srq, char *extra) { @@ -1273,7 +1262,7 @@ static int prism2_result2err(int prism2_result) return err; } -static int p80211wext_siwscan(netdevice_t * dev, +static int p80211wext_siwscan(netdevice_t *dev, struct iw_request_info *info, struct iw_point *srq, char *extra) { @@ -1320,7 +1309,7 @@ exit: */ static char *wext_translate_bss(struct iw_request_info *info, char *current_ev, char *end_buf, - p80211msg_dot11req_scan_results_t * bss) + p80211msg_dot11req_scan_results_t *bss) { struct iw_event iwe; /* Temporary buffer */ @@ -1404,7 +1393,7 @@ static char *wext_translate_bss(struct iw_request_info *info, char *current_ev, return current_ev; } -static int p80211wext_giwscan(netdevice_t * dev, +static int p80211wext_giwscan(netdevice_t *dev, struct iw_request_info *info, struct iw_point *srq, char *extra) { |