diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8712/rtl871x_ioctl_set.h | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/rtl871x_ioctl_set.h')
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_ioctl_set.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.h b/drivers/staging/rtl8712/rtl871x_ioctl_set.h new file mode 100644 index 0000000..283afbf --- /dev/null +++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.h @@ -0,0 +1,24 @@ +#ifndef __IOCTL_SET_H +#define __IOCTL_SET_H + +#include "drv_types.h" + +typedef u8 NDIS_802_11_PMKID_VALUE[16]; + +struct BSSIDInfo { + unsigned char BSSID[6]; + NDIS_802_11_PMKID_VALUE PMKID; +}; + +u8 r8712_set_802_11_authentication_mode(struct _adapter *pdapter, + enum NDIS_802_11_AUTHENTICATION_MODE authmode); +u8 r8712_set_802_11_bssid(struct _adapter *padapter, u8 *bssid); +u8 r8712_set_802_11_add_wep(struct _adapter *padapter, struct NDIS_802_11_WEP *wep); +u8 r8712_set_802_11_disassociate(struct _adapter *padapter); +u8 r8712_set_802_11_bssid_list_scan(struct _adapter *padapter); +u8 r8712_set_802_11_infrastructure_mode(struct _adapter *padapter, + enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype); +void r8712_set_802_11_ssid(struct _adapter *padapter, struct ndis_802_11_ssid *ssid); + +#endif + |
