diff options
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r-- | fs/cifs/cifssmb.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 4511b708f0f3..c621ffa2ca90 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
@@ -686,11 +686,10 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) | |||
686 | SecurityBlob, | 686 | SecurityBlob, |
687 | count - 16, | 687 | count - 16, |
688 | &server->secType); | 688 | &server->secType); |
689 | if (rc == 1) { | 689 | if (rc == 1) |
690 | rc = 0; | 690 | rc = 0; |
691 | } else { | 691 | else |
692 | rc = -EINVAL; | 692 | rc = -EINVAL; |
693 | } | ||
694 | } | 693 | } |
695 | } else | 694 | } else |
696 | server->capabilities &= ~CAP_EXTENDED_SECURITY; | 695 | server->capabilities &= ~CAP_EXTENDED_SECURITY; |
@@ -3914,7 +3913,10 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, | |||
3914 | bool is_unicode; | 3913 | bool is_unicode; |
3915 | struct dfs_referral_level_3 *ref; | 3914 | struct dfs_referral_level_3 *ref; |
3916 | 3915 | ||
3917 | is_unicode = pSMBr->hdr.Flags2 & SMBFLG2_UNICODE; | 3916 | if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) |
3917 | is_unicode = true; | ||
3918 | else | ||
3919 | is_unicode = false; | ||
3918 | *num_of_nodes = le16_to_cpu(pSMBr->NumberOfReferrals); | 3920 | *num_of_nodes = le16_to_cpu(pSMBr->NumberOfReferrals); |
3919 | 3921 | ||
3920 | if (*num_of_nodes < 1) { | 3922 | if (*num_of_nodes < 1) { |