Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / fs / cifs / smb2pdu.c

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 8f1672b..3417340 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -431,8 +431,7 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
        if (rc)
                goto neg_exit;
        if (blob_length)
-               rc = decode_neg_token_init(security_blob, blob_length,
-                                  &server->sec_type);
+               rc = decode_negTokenInit(security_blob, blob_length, server);
        if (rc == 1)
                rc = 0;
        else if (rc == 0) {
@@ -1359,7 +1358,7 @@ SMB2_set_compression(const unsigned int xid, struct cifs_tcon *tcon,
        char *ret_data = NULL;
 
        fsctl_input.CompressionState =
-                       __constant_cpu_to_le16(COMPRESSION_FORMAT_DEFAULT);
+                       cpu_to_le16(COMPRESSION_FORMAT_DEFAULT);
 
        rc = SMB2_ioctl(xid, tcon, persistent_fid, volatile_fid,
                        FSCTL_SET_COMPRESSION, true /* is_fsctl */,