Merge branch 'devel'

Author: Kelvin Cao

Makefile

@@ -67,7 +67,7 @@ install-man:
 
 install-bin: default
 	$(INSTALL) -d $(DESTDIR)$(SBINDIR)
-	$(INSTALL) -m 755 nvme $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -m 755 $(NVME) $(DESTDIR)$(SBINDIR)
 
 install-bash-completion:
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bash_completion.d

switchtec-nvme-device.c

@@ -45,9 +45,7 @@ struct switchtec_device_manage_nvme_rsp
 {
 	struct switchtec_device_manage_rsp_hdr hdr;
 	uint32_t nvme_cqe[4];
-	uint8_t nvme_data[MRPC_MAX_DATA_LEN -
-		sizeof(struct switchtec_device_manage_rsp_hdr) -
-		(4 * 4)];
+	uint8_t nvme_data[SWITCHTEC_DEVICE_MANAGE_MAX_RESP - (4 * 4)];
 };
 
 int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)
@@ -78,7 +76,7 @@ int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)
 
 	memcpy(req.nvme_data, (void *)cmd->addr, data_len);
 
-	req.hdr.expected_rsp_len = (sizeof(rsp.nvme_cqe) + sizeof(rsp.nvme_data))/4;
+	req.hdr.expected_rsp_len = (sizeof(rsp.nvme_cqe) + sizeof(rsp.nvme_data));
 
 	ret = switchtec_device_manage(pax->dev,
 				     (struct switchtec_device_manage_req *)&req,
@@ -95,7 +93,7 @@ int pax_nvme_submit_admin_passthru(int fd, struct nvme_passthru_cmd *cmd)
 		if (!write) {
 			memcpy((uint64_t *)cmd->addr,
 				rsp.nvme_data,
-				(rsp.hdr.rsp_len - 4) * 4);
+				rsp.hdr.rsp_len - 4 * 4);
 		}
 	}