summaryrefslogtreecommitdiff
path: root/drivers/staging/vt6656/wpa2.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-07-21 14:04:28 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-07-21 14:04:28 +1000
commit7792509d8fa63c0f4346e6afc7d84c282950c6b6 (patch)
treeeec75322e2d2e790b0344c32a10444a75d76d202 /drivers/staging/vt6656/wpa2.h
parent24e76bc81cf10d04947f132c15548ebfbc8bc1bf (diff)
parenta6bff488e7267b65d7c6b2e0d5d2dd2257e65ea4 (diff)
Merge remote branch 'staging-next/staging-next'
Conflicts: drivers/staging/batman-adv/bat_sysfs.c drivers/staging/batman-adv/device.c drivers/staging/cx25821/cx25821-audups11.c
Diffstat (limited to 'drivers/staging/vt6656/wpa2.h')
-rw-r--r--drivers/staging/vt6656/wpa2.h18
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__ */