diff options
Diffstat (limited to 'fs/cifs/sess.c')
-rw-r--r-- | fs/cifs/sess.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index c039b54206aa..70e32a81c213 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c | |||
@@ -33,8 +33,6 @@ | |||
33 | extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8, | 33 | extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8, |
34 | unsigned char *p24); | 34 | unsigned char *p24); |
35 | 35 | ||
36 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
37 | |||
38 | static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB) | 36 | static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB) |
39 | { | 37 | { |
40 | __u32 capabilities = 0; | 38 | __u32 capabilities = 0; |
@@ -319,7 +317,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
319 | __u32 capabilities; | 317 | __u32 capabilities; |
320 | int count; | 318 | int count; |
321 | int resp_buf_type = 0; | 319 | int resp_buf_type = 0; |
322 | struct kvec iov[1]; | 320 | struct kvec iov[2]; /* BB split variable length info into 2nd iovec */ |
323 | enum securityEnum type; | 321 | enum securityEnum type; |
324 | __u16 action; | 322 | __u16 action; |
325 | int bytes_remaining; | 323 | int bytes_remaining; |
@@ -489,7 +487,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
489 | } | 487 | } |
490 | action = le16_to_cpu(pSMB->resp.Action); | 488 | action = le16_to_cpu(pSMB->resp.Action); |
491 | if (action & GUEST_LOGIN) | 489 | if (action & GUEST_LOGIN) |
492 | cFYI(1, (" Guest login")); /* BB mark SesInfo struct? */ | 490 | cFYI(1, ("Guest login")); /* BB mark SesInfo struct? */ |
493 | ses->Suid = smb_buf->Uid; /* UID left in wire format (le) */ | 491 | ses->Suid = smb_buf->Uid; /* UID left in wire format (le) */ |
494 | cFYI(1, ("UID = %d ", ses->Suid)); | 492 | cFYI(1, ("UID = %d ", ses->Suid)); |
495 | /* response can have either 3 or 4 word count - Samba sends 3 */ | 493 | /* response can have either 3 or 4 word count - Samba sends 3 */ |
@@ -525,4 +523,3 @@ ssetup_exit: | |||
525 | 523 | ||
526 | return rc; | 524 | return rc; |
527 | } | 525 | } |
528 | #endif /* CONFIG_CIFS_EXPERIMENTAL */ | ||