aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifssmb.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-09-29 21:07:38 -0400
committerSteve French <sfrench@us.ibm.com>2006-09-29 21:07:38 -0400
commit175ec9e11cf18f8373b32f7a33e75a4cf7ce25e3 (patch)
treed261c6ce707654685fefc1759044718a23c1add1 /fs/cifs/cifssmb.c
parent25ee4a98c662317a7973f3053567d4ec51857511 (diff)
[CIFS] Rename server time zone field
Server time zone is not really a time zone, rather a time adjustement in seconds. CC: Guenter Kukkukk <linux@kukkukk.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r--fs/cifs/cifssmb.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 99718591ea29..6e004587fa48 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -473,7 +473,6 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
473 server->maxRw = 0;/* we do not need to use raw anyway */ 473 server->maxRw = 0;/* we do not need to use raw anyway */
474 server->capabilities = CAP_MPX_MODE; 474 server->capabilities = CAP_MPX_MODE;
475 } 475 }
476 server->timeZone = le16_to_cpu(rsp->ServerTimeZone);
477 tmp = le16_to_cpu(rsp->ServerTimeZone); 476 tmp = le16_to_cpu(rsp->ServerTimeZone);
478 if (tmp == (int)0xffff) { 477 if (tmp == (int)0xffff) {
479 /* OS/2 often does not set timezone therefore 478 /* OS/2 often does not set timezone therefore
@@ -492,11 +491,11 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
492 tmp = (int)(utc.tv_sec - ts.tv_sec); 491 tmp = (int)(utc.tv_sec - ts.tv_sec);
493 adjust = tmp < 0 ? -29 : 29; 492 adjust = tmp < 0 ? -29 : 29;
494 tmp = ((tmp + adjust) / 60) * 60; 493 tmp = ((tmp + adjust) / 60) * 60;
495 server->timeZone = tmp; 494 server->timeAdj = tmp;
496 } else { 495 } else {
497 server->timeZone = tmp * 60; /* also in seconds */ 496 server->timeAdj = tmp * 60; /* also in seconds */
498 } 497 }
499 cFYI(1,("server->timeZone: %d seconds", server->timeZone)); 498 cFYI(1,("server->timeAdj: %d seconds", server->timeAdj));
500 499
501 500
502 /* BB get server time for time conversions and add 501 /* BB get server time for time conversions and add
@@ -557,7 +556,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
557 cFYI(0, ("Max buf = %d", ses->server->maxBuf)); 556 cFYI(0, ("Max buf = %d", ses->server->maxBuf));
558 GETU32(ses->server->sessid) = le32_to_cpu(pSMBr->SessionKey); 557 GETU32(ses->server->sessid) = le32_to_cpu(pSMBr->SessionKey);
559 server->capabilities = le32_to_cpu(pSMBr->Capabilities); 558 server->capabilities = le32_to_cpu(pSMBr->Capabilities);
560 server->timeZone = le16_to_cpu(pSMBr->ServerTimeZone); 559 server->timeAdj = le16_to_cpu(pSMBr->ServerTimeZone) * 60;
561 if (pSMBr->EncryptionKeyLength == CIFS_CRYPTO_KEY_SIZE) { 560 if (pSMBr->EncryptionKeyLength == CIFS_CRYPTO_KEY_SIZE) {
562 memcpy(server->cryptKey, pSMBr->u.EncryptionKey, 561 memcpy(server->cryptKey, pSMBr->u.EncryptionKey,
563 CIFS_CRYPTO_KEY_SIZE); 562 CIFS_CRYPTO_KEY_SIZE);