diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 21:59:44 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 21:59:44 (GMT) |
commit | 8966961b31c251b854169e9886394c2a20f2cea7 (patch) | |
tree | 248a625b23335acbd5ca4b55eb136fe0dc8ba0aa /drivers/staging/vt6656/iwctl.h | |
parent | 6a5971d8fea1f4a8c33dfe0cec6a1c490f0c9cde (diff) | |
parent | 7bcb57cde66c19df378f3468ea342166a8a4504d (diff) | |
download | linux-fsl-qoriq-8966961b31c251b854169e9886394c2a20f2cea7.tar.xz |
Merge tag 'staging-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver tree merge from Greg Kroah-Hartman:
"Here's the big staging tree merge for 3.8-rc1
There's a lot of patches in here, the majority being the comedi
rework/cleanup that has been ongoing and is causing a huge reduction
in overall code size, which is amazing to watch. We also removed some
older drivers (telephony and rts_pstor), and added a new one (fwserial
which also came in through the tty tree due to tty api changes, take
that one if you get merge conflicts.)
The iio and ipack drivers are moving out of the staging area into
their own part of the kernel as they have been cleaned up sufficiently
and are working well.
Overall, again a reduction of code:
768 files changed, 31887 insertions(+), 82166 deletions(-)
All of this has been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'staging-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1298 commits)
iio: imu: adis16480: remove duplicated include from adis16480.c
iio: gyro: adis16136: remove duplicated include from adis16136.c
iio:imu: adis16480: show_firmware() buffer too small
iio:gyro: adis16136: divide by zero in write_frequency()
iio: adc: Add Texas Instruments ADC081C021/027 support
iio:ad7793: Add support for the ad7796 and ad7797
iio:ad7793: Add support for the ad7798 and ad7799
staging:iio: Move ad7793 driver out of staging
staging:iio:ad7793: Implement stricter id checking
staging:iio:ad7793: Move register definitions from header to source
staging:iio:ad7793: Rework regulator handling
staging:iio:ad7793: Rework platform data
staging:iio:ad7793: Use kstrtol instead of strict_strtol
staging:iio:ad7793: Use usleep_range instead of msleep
staging:iio:ad7793: Fix temperature scale
staging:iio:ad7793: Fix VDD monitor scale
staging: gdm72xx: unlock on error in init_usb()
staging: panel: pass correct lengths to keypad_send_key()
staging: comedi: addi_apci_2032: fix interrupt support
staging: comedi: addi_apci_2032: move i_APCI2032_ConfigDigitalOutput()
...
Diffstat (limited to 'drivers/staging/vt6656/iwctl.h')
-rw-r--r-- | drivers/staging/vt6656/iwctl.h | 79 |
1 files changed, 39 insertions, 40 deletions
diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h index d056f83..b594a10 100644 --- a/drivers/staging/vt6656/iwctl.h +++ b/drivers/staging/vt6656/iwctl.h @@ -42,106 +42,105 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev); int iwctl_siwap(struct net_device *dev, struct iw_request_info *info, - struct sockaddr *wrq, char *extra); + union iwreq_data *wrqu, char *extra); -void iwctl_giwrange(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); +int iwctl_giwrange(struct net_device *dev, struct iw_request_info *info, + union iwreq_data *wrqu, char *extra); -void iwctl_giwmode(struct net_device *dev, struct iw_request_info *info, - __u32 *wmode, char *extra); +int iwctl_giwmode(struct net_device *dev, struct iw_request_info *info, + union iwreq_data *wrqu, char *extra); int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info, - __u32 *wmode, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwfreq(struct net_device *dev, struct iw_request_info *info, - struct iw_freq *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwfreq(struct net_device *dev, struct iw_request_info *info, - struct iw_freq *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwname(struct net_device *dev, struct iw_request_info *info, - char *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwsens(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwap(struct net_device *dev, struct iw_request_info *info, - struct sockaddr *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwaplist(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); + union iwreq_data *wrqu, char *extra); -void iwctl_giwessid(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); +int iwctl_giwessid(struct net_device *dev, struct iw_request_info *info, + union iwreq_data *wrqu, char *extra); int iwctl_siwrate(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); -void iwctl_giwrate(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); +int iwctl_giwrate(struct net_device *dev, struct iw_request_info *info, + union iwreq_data *wrqu, char *extra); -int iwctl_siwrts(struct net_device *dev, struct iw_param *wrq); +int iwctl_siwrts(struct net_device *dev, struct iw_request_info *info, + union iwreq_data *wrqu, char *extra); int iwctl_giwrts(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwfrag(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwfrag(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwretry(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwretry(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwencode(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwpower(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwpower(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); -#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwauth(struct net_device *dev, struct iw_request_info *info, - struct iw_param *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwgenie(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwgenie(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_giwencodeext(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); + union iwreq_data *wrqu, char *extra); int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info, - struct iw_point *wrq, char *extra); -#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT + union iwreq_data *wrqu, char *extra); extern const struct iw_handler_def iwctl_handler_def; -extern const struct iw_priv_args iwctl_private_args; +extern const struct iw_priv_args iwctl_priv_args; #endif /* __IWCTL_H__ */ |