Skip to content

Commit f915da0

Browse files
committed
Merge tag 'nvme-6.3-2023-03-23' of git://git.infradead.org/nvme into block-6.3
Pull NVMe fixes from Christoph: "nvme fixes for Linux 6.3 - send Identify with CNS 06h only to I/O controllers (Martin George) - fix nvme_tcp_term_pdu to match spec (Caleb Sander)" * tag 'nvme-6.3-2023-03-23' of git://git.infradead.org/nvme: nvme-tcp: fix nvme_tcp_term_pdu to match spec nvme: send Identify with CNS 06h only to I/O controllers
2 parents 9d2789a + aa01c67 commit f915da0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

drivers/nvme/host/core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3063,7 +3063,8 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl)
30633063
else
30643064
ctrl->max_zeroes_sectors = 0;
30653065

3066-
if (nvme_ctrl_limited_cns(ctrl))
3066+
if (ctrl->subsys->subtype != NVME_NQN_NVME ||
3067+
nvme_ctrl_limited_cns(ctrl))
30673068
return 0;
30683069

30693070
id = kzalloc(sizeof(*id), GFP_KERNEL);

include/linux/nvme-tcp.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,9 @@ struct nvme_tcp_icresp_pdu {
115115
struct nvme_tcp_term_pdu {
116116
struct nvme_tcp_hdr hdr;
117117
__le16 fes;
118-
__le32 fei;
119-
__u8 rsvd[8];
118+
__le16 feil;
119+
__le16 feiu;
120+
__u8 rsvd[10];
120121
};
121122

122123
/**

0 commit comments

Comments
 (0)