From 19e4849e07d8370a7b77687e31097cafff652939 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 15 Aug 2006 13:35:48 +0000 Subject: [PATCH] --- yaml --- r: 33679 b: refs/heads/master c: 5ddaa683a513439081c9511b0d9ad490672c51c9 h: refs/heads/master i: 33677: a65cb76f1c7b89e19aaf336081a6eac43f866304 33675: 7abbdca7f0c56766ccff0797442b07f831367980 33671: 5953f4e371311af1bc4b2d9753dd8773bbf614f1 33663: 4057f30cfbe901a6d86fdb16538147ff67670579 v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifssmb.c | 2 +- trunk/fs/cifs/readdir.c | 2 +- trunk/fs/cifs/sess.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 204cc1d5776c..ff278fabbe42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e466e4876bf39474e15d0572f2204578137ae7f5 +refs/heads/master: 5ddaa683a513439081c9511b0d9ad490672c51c9 diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c index dcbc3e075e81..075d8fb3d376 100644 --- a/trunk/fs/cifs/cifssmb.c +++ b/trunk/fs/cifs/cifssmb.c @@ -477,7 +477,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) /* BB get server time for time conversions and add code to use it and timezone since this is not UTC */ - if (rsp->EncryptionKeyLength == CIFS_CRYPTO_KEY_SIZE) { + if (rsp->EncryptionKeyLength == cpu_to_le16(CIFS_CRYPTO_KEY_SIZE)) { memcpy(server->cryptKey, rsp->EncryptionKey, CIFS_CRYPTO_KEY_SIZE); } else if (server->secMode & SECMODE_PW_ENCRYPT) { diff --git a/trunk/fs/cifs/readdir.c b/trunk/fs/cifs/readdir.c index 03bbcb377913..105761e3ba0e 100644 --- a/trunk/fs/cifs/readdir.c +++ b/trunk/fs/cifs/readdir.c @@ -556,7 +556,7 @@ static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile) FIND_FILE_STANDARD_INFO * pFindData = (FIND_FILE_STANDARD_INFO *)current_entry; filename = &pFindData->FileName[0]; - len = le32_to_cpu(pFindData->FileNameLength); + len = pFindData->FileNameLength; } else { cFYI(1,("Unknown findfirst level %d",cfile->srch_inf.info_level)); } diff --git a/trunk/fs/cifs/sess.c b/trunk/fs/cifs/sess.c index 7202d534ef0b..d1705ab8136e 100644 --- a/trunk/fs/cifs/sess.c +++ b/trunk/fs/cifs/sess.c @@ -372,7 +372,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, /* no capabilities flags in old lanman negotiation */ - pSMB->old_req.PasswordLength = CIFS_SESS_KEY_SIZE; + pSMB->old_req.PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE); /* BB calculate hash with password */ /* and copy into bcc */