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/vt6656/wpa.c | |
| 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/vt6656/wpa.c')
| -rw-r--r-- | drivers/staging/vt6656/wpa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/wpa.c b/drivers/staging/vt6656/wpa.c index f492778..7dde3d6 100644 --- a/drivers/staging/vt6656/wpa.c +++ b/drivers/staging/vt6656/wpa.c @@ -69,7 +69,7 @@ const BYTE abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 }; -*/ void -WPA_ClearRSN ( +WPA_ClearRSN( PKnownBSS pBSSList ) { @@ -105,7 +105,7 @@ WPA_ClearRSN ( * -*/ void -WPA_ParseRSN ( +WPA_ParseRSN( PKnownBSS pBSSList, PWLAN_IE_RSN_EXT pRSN ) @@ -240,7 +240,7 @@ WPA_ParseRSN ( * -*/ BOOL -WPA_SearchRSN ( +WPA_SearchRSN( BYTE byCmd, BYTE byEncrypt, PKnownBSS pBSSList @@ -300,7 +300,7 @@ WPA_SearchRSN ( * -*/ BOOL -WPAb_Is_RSN ( +WPAb_Is_RSN( PWLAN_IE_RSN_EXT pRSN ) { |
