diff -Nru a/fs/cifs/asn1.c b/fs/cifs/asn1.c
--- a/fs/cifs/asn1.c	Sat Oct 12 03:04:46 2002
+++ b/fs/cifs/asn1.c	Sat Oct 12 03:04:46 2002
@@ -458,7 +458,7 @@
 	unsigned int cls, con, tag, oidlen, rc;
 	int use_ntlmssp = FALSE;
 
-	dump_mem(" Received SecBlob ", security_blob, length);
+	/* cifs_dump_mem(" Received SecBlob ", security_blob, length); */
 
 	asn1_open(&ctx, security_blob, length);
 
diff -Nru a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
--- a/fs/cifs/cifs_debug.c	Sat Oct 12 03:04:46 2002
+++ b/fs/cifs/cifs_debug.c	Sat Oct 12 03:04:46 2002
@@ -32,7 +32,7 @@
 #include "cifs_debug.h"
 
 void
-dump_mem(char *label, void *data, int length)
+cifs_dump_mem(char *label, void *data, int length)
 {
 	int i, j;
 	int *intptr = data;
diff -Nru a/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h
--- a/fs/cifs/cifs_debug.h	Sat Oct 12 03:04:46 2002
+++ b/fs/cifs/cifs_debug.h	Sat Oct 12 03:04:46 2002
@@ -23,7 +23,7 @@
 #ifndef _H_CIFS_DEBUG
 #define _H_CIFS_DEBUG
 
-void dump_mem(char *label, void *data, int length);
+void cifs_dump_mem(char *label, void *data, int length);
 extern int traceSMB;		/* flag which enables the function below */
 void dump_smb(struct smb_hdr *, int);
 
diff -Nru a/fs/cifs/connect.c b/fs/cifs/connect.c
--- a/fs/cifs/connect.c	Sat Oct 12 03:04:46 2002
+++ b/fs/cifs/connect.c	Sat Oct 12 03:04:46 2002
@@ -168,7 +168,7 @@
 			} else if (temp[0] != (char) 0) {
 				cERROR(1,
 				       ("\nUnknown RFC 1001 frame received not 0x00 nor 0x85"));
-				dump_mem(" Received Data is: ", temp, length);
+				cifs_dump_mem(" Received Data is: ", temp, length);
 				break;
 			} else {
 				if ((length != sizeof (struct smb_hdr) - 1)
@@ -757,8 +757,7 @@
                /* Removed following few lines to not send old style password 
                   hash ever - for better security */
 			   /* toUpper(cifs_sb->local_nls, password_with_pad);
-				   SMBencrypt(password_with_pad, cryptKey,session_key); 
-				   dump_mem("\nCIFS (Samba encrypt): ", session_key,CIFS_SESSION_KEY_SIZE); */
+				   SMBencrypt(password_with_pad, cryptKey,session_key); */
 
 				rc = CIFSSessSetup(xid, pSesInfo,
 						   volume_info.username,
@@ -989,7 +988,6 @@
 
 	rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response,
 			 &bytes_returned, 1);
-	/* dump_mem("\nSessSetup response is: ", smb_buffer_response, 92);*/
 	if (rc) {
 /* rc = map_smb_to_linux_error(smb_buffer_response); now done in SendReceive */
 	} else if ((smb_buffer_response->WordCount == 3)
@@ -1235,7 +1233,6 @@
 
 	rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response,
 			 &bytes_returned, 1);
-	/* dump_mem("\nSessSetup response is: ", smb_buffer_response, 92);  */
 	if (rc) {
 /*    rc = map_smb_to_linux_error(smb_buffer_response);  *//* done in SendReceive now */
 	} else if ((smb_buffer_response->WordCount == 3)