diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 15:03:11 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 15:03:11 +1000 |
| commit | fa49686c1e78e51bb7e443029afe604bd2ddf49e (patch) | |
| tree | edaf2b53170f723e8baecba45073ab03ec796804 /drivers/staging/vt6656/wpa2.h | |
| parent | 9f28e837bf1a78db2497b61cb2e78f39be2fe2b3 (diff) | |
| parent | 83c720ea395c4ee725e1035cbcda809794b46091 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Diffstat (limited to 'drivers/staging/vt6656/wpa2.h')
| -rw-r--r-- | drivers/staging/vt6656/wpa2.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h index 429a910a5c50..46c295905b48 100644 --- a/drivers/staging/vt6656/wpa2.h +++ b/drivers/staging/vt6656/wpa2.h @@ -58,21 +58,9 @@ typedef struct tagSPMKIDCache { /*--------------------- Export Functions --------------------------*/ -void -WPA2_ClearRSN ( - PKnownBSS pBSSNode - ); +void WPA2_ClearRSN(PKnownBSS pBSSNode); +void WPA2vParseRSN(PKnownBSS pBSSNode, PWLAN_IE_RSN pRSN); -void -WPA2vParseRSN ( - PKnownBSS pBSSNode, - PWLAN_IE_RSN pRSN - ); - -unsigned int -WPA2uSetIEs( - void *pMgmtHandle, - PWLAN_IE_RSN pRSNIEs - ); +unsigned int WPA2uSetIEs(void *pMgmtHandle, PWLAN_IE_RSN pRSNIEs); #endif /* __WPA2_H__ */ |