aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/sess.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs/sess.c')
-rw-r--r--fs/cifs/sess.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 9ce628df29b4..c6fd01f55e90 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -411,8 +411,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
411 else 411 else
412 ascii_ssetup_strings(&bcc_ptr, ses, nls_cp); 412 ascii_ssetup_strings(&bcc_ptr, ses, nls_cp);
413 } else if (type == NTLMv2) { 413 } else if (type == NTLMv2) {
414 char * v2_sess_key = kmalloc(sizeof(struct ntlmv2_resp), 414 char * v2_sess_key =
415 GFP_KERNEL); 415 kmalloc(sizeof(struct ntlmv2_resp), GFP_KERNEL);
416 416
417 /* BB FIXME change all users of v2_sess_key to 417 /* BB FIXME change all users of v2_sess_key to
418 struct ntlmv2_resp */ 418 struct ntlmv2_resp */
@@ -432,7 +432,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
432 cpu_to_le16(sizeof(struct ntlmv2_resp)); 432 cpu_to_le16(sizeof(struct ntlmv2_resp));
433 433
434 /* calculate session key */ 434 /* calculate session key */
435 CalcNTLMv2_response(ses, v2_sess_key); 435 setup_ntlmv2_rsp(ses, v2_sess_key);
436 if(first_time) /* should this be moved into common code 436 if(first_time) /* should this be moved into common code
437 with similar ntlmv2 path? */ 437 with similar ntlmv2 path? */
438 /* cifs_calculate_ntlmv2_mac_key(ses->server->mac_signing_key, 438 /* cifs_calculate_ntlmv2_mac_key(ses->server->mac_signing_key,