Commit 7f7ae759 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: remove rfc1002 header from smb2_echo_req

parent 97754680
Loading
Loading
Loading
Loading
+8 −6
Original line number Diff line number Diff line
@@ -2397,6 +2397,8 @@ SMB2_echo(struct TCP_Server_Info *server)
	struct kvec iov[2];
	struct smb_rqst rqst = { .rq_iov = iov,
				 .rq_nvec = 2 };
	unsigned int total_len;
	__be32 rfc1002_marker;

	cifs_dbg(FYI, "In echo request\n");

@@ -2406,17 +2408,17 @@ SMB2_echo(struct TCP_Server_Info *server)
		return rc;
	}

	rc = small_smb2_init(SMB2_ECHO, NULL, (void **)&req);
	rc = smb2_plain_req_init(SMB2_ECHO, NULL, (void **)&req, &total_len);
	if (rc)
		return rc;

	req->hdr.sync_hdr.CreditRequest = cpu_to_le16(1);
	req->sync_hdr.CreditRequest = cpu_to_le16(1);

	/* 4 for rfc1002 length field */
	iov[0].iov_len = 4;
	iov[0].iov_base = (char *)req;
	iov[1].iov_len = get_rfc1002_length(req);
	iov[1].iov_base = (char *)req + 4;
	rfc1002_marker = cpu_to_be32(total_len);
	iov[0].iov_base = &rfc1002_marker;
	iov[1].iov_len = total_len;
	iov[1].iov_base = (char *)req;

	rc = cifs_call_async(server, &rqst, NULL, smb2_echo_callback, NULL,
			     server, CIFS_ECHO_OP);
+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ struct smb2_lock_rsp {
} __packed;

struct smb2_echo_req {
	struct smb2_hdr hdr;
	struct smb2_sync_hdr sync_hdr;
	__le16 StructureSize;	/* Must be 4 */
	__u16  Reserved;
} __packed;