From 5477c921eea1c762f8b5ca0a36110f8eb6a24201 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 16 Jun 2010 13:40:18 -0400
Subject: [PATCH] --- yaml --- r: 200447 b: refs/heads/master c:
 8a224d489454b7457105848610cfebebdec5638d h: refs/heads/master i:   200445:
 498c1365163f028aaf7fdbd897d5131c658f6a08   200443:
 44b8687fccaab670c056739e374a4412e861c4dd   200439:
 2e1732b44c178bcd0579bdb09ad95c298c3c794c   200431:
 3bed0f5abad13f03e49637f6fc4da97c8c10efd2   200415:
 04d8007a6079d594fba4fdc9bb0f1c6cf686ab26   200383:
 9a1891d33412eb8552a1f8223eca50d262d20806   200319:
 754f72bbd0a238e6c454b203c2c2682f9b795510   200191:
 7bbce07f088565068c86a8e07d78775656b7397d v: v3

---
 [refs]               |  2 +-
 trunk/fs/cifs/sess.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4698bab353b6..8372db28b59f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47c78b7f40a9931a264e3c9bddccacdf8dfb9a30
+refs/heads/master: 8a224d489454b7457105848610cfebebdec5638d
diff --git a/trunk/fs/cifs/sess.c b/trunk/fs/cifs/sess.c
index 7707389bdf2c..0a57cb7db5dd 100644
--- a/trunk/fs/cifs/sess.c
+++ b/trunk/fs/cifs/sess.c
@@ -730,15 +730,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
 
 		/* calculate session key */
 		setup_ntlmv2_rsp(ses, v2_sess_key, nls_cp);
-		if (first_time) /* should this be moved into common code
-				   with similar ntlmv2 path? */
-		/*   cifs_calculate_ntlmv2_mac_key(ses->server->mac_signing_key,
-				response BB FIXME, v2_sess_key); */
-
-		/* copy session key */
-
-	/*	memcpy(bcc_ptr, (char *)ntlm_session_key,LM2_SESS_KEY_SIZE);
-		bcc_ptr += LM2_SESS_KEY_SIZE; */
+		/* FIXME: calculate MAC key */
 		memcpy(bcc_ptr, (char *)v2_sess_key,
 		       sizeof(struct ntlmv2_resp));
 		bcc_ptr += sizeof(struct ntlmv2_resp);