aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsglob.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2010-09-08 16:57:05 -0400
committerSteve French <sfrench@us.ibm.com>2010-09-08 16:57:05 -0400
commit56234e2767496c125a858f880f1b3a62e04a3406 (patch)
treec83ff996256b7889d8e84d7b2a19eeb15467dad1 /fs/cifs/cifsglob.h
parent7100ae97266e387d25d0c8a5d9934931f0b07dbc (diff)
Revert "Eliminate sparse warning - bad constant expression"
This reverts commit 2d20ca835867d93ead6ce61780d883a4b128106d. The change to kernel crypto and fixes to ntlvm2 and ntlmssp series, introduced a regression. Deferring this patch series to 2.6.37 after Shirish fixes it. Signed-off-by: Steve French <sfrench@us.ibm.com> Acked-by: Jeff Layton <jlayton@redhat.com> CC: Shirish Pargaonkar <shirishp@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r--fs/cifs/cifsglob.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index c9d0cfc086eb..49563e0c1725 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -123,19 +123,12 @@ struct cifs_cred {
123 struct cifs_ace *aces; 123 struct cifs_ace *aces;
124}; 124};
125 125
126struct sdesc {
127 struct shash_desc shash;
128 char ctx[];
129};
130
131struct ntlmssp_auth { 126struct ntlmssp_auth {
132 __u32 client_flags; 127 __u32 client_flags;
133 __u32 server_flags; 128 __u32 server_flags;
134 unsigned char ciphertext[CIFS_CPHTXT_SIZE]; 129 unsigned char ciphertext[CIFS_CPHTXT_SIZE];
135 struct crypto_shash *hmacmd5; 130 struct crypto_shash *hmacmd5;
136 struct crypto_shash *md5; 131 struct crypto_shash *md5;
137 struct sdesc *sdeschmacmd5;
138 struct sdesc *sdescmd5;
139}; 132};
140 133
141/* 134/*