diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:22:32 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:22:32 -0700 |
commit | c781b96b8007d758a38e9c670957ba48e254f039 (patch) | |
tree | dbeb7429be45f84eb940e436dfc9696b8359acd2 /drivers/staging/csr/csr_wifi_nme_prim.h | |
parent | 7f5393ea2d432c074d0b3796728e6abd182736b3 (diff) | |
download | op-kernel-dev-c781b96b8007d758a38e9c670957ba48e254f039.zip op-kernel-dev-c781b96b8007d758a38e9c670957ba48e254f039.tar.gz |
staging: csr: remove CsrCharString typedef
Use char instead.
Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_wifi_nme_prim.h')
-rw-r--r-- | drivers/staging/csr/csr_wifi_nme_prim.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/csr/csr_wifi_nme_prim.h b/drivers/staging/csr/csr_wifi_nme_prim.h index 2c73943..07ed884 100644 --- a/drivers/staging/csr/csr_wifi_nme_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_prim.h @@ -547,7 +547,7 @@ typedef struct typedef struct { u16 encryptionMode; - CsrCharString *passphrase; + char *passphrase; } CsrWifiNmePassphrase; /******************************************************************************* @@ -708,22 +708,22 @@ typedef struct CsrWifiNmeEapMethodMask eapMethodMask; CsrWifiSmeAuthModeMask authMode; CsrWifiNmeEncryptionMask encryptionMode; - CsrCharString *userName; - CsrCharString *userPassword; - CsrCharString *authServerUserIdentity; + char *userName; + char *userPassword; + char *authServerUserIdentity; u32 clientCertificateLength; u8 *clientCertificate; u32 certificateAuthorityCertificateLength; u8 *certificateAuthorityCertificate; u16 privateKeyLength; u8 *privateKey; - CsrCharString *privateKeyPassword; + char *privateKeyPassword; u32 sessionLength; u8 *session; CsrBool allowPacProvisioning; u32 pacLength; u8 *pac; - CsrCharString *pacPassword; + char *pacPassword; } CsrWifiNmeEapCredentials; /******************************************************************************* @@ -1153,7 +1153,7 @@ typedef struct { CsrWifiFsmEvent common; CsrResult status; - CsrCharString *imsi; + char *imsi; CsrWifiNmeSimCardType cardType; } CsrWifiNmeSimImsiGetRes; |