diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2023-03-23 13:02:20 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-03-23 13:02:20 -0600 |
| commit | f915da0f0dfb69ffea53f62101b38073e0b81f73 (patch) | |
| tree | dd1ab337c4a58a228ff1aeb4d5d9258c27f1acb1 | |
| parent | block/io_uring: pass in issue_flags for uring_cmd task_work handling (diff) | |
| parent | nvme-tcp: fix nvme_tcp_term_pdu to match spec (diff) | |
| download | wireguard-linux-f915da0f0dfb69ffea53f62101b38073e0b81f73.tar.xz wireguard-linux-f915da0f0dfb69ffea53f62101b38073e0b81f73.zip | |
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
| -rw-r--r-- | drivers/nvme/host/core.c | 3 | ||||
| -rw-r--r-- | include/linux/nvme-tcp.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index d4be525f8100..53ef028596c6 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3063,7 +3063,8 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl) else ctrl->max_zeroes_sectors = 0; - if (nvme_ctrl_limited_cns(ctrl)) + if (ctrl->subsys->subtype != NVME_NQN_NVME || + nvme_ctrl_limited_cns(ctrl)) return 0; id = kzalloc(sizeof(*id), GFP_KERNEL); diff --git a/include/linux/nvme-tcp.h b/include/linux/nvme-tcp.h index 75470159a194..57ebe1267f7f 100644 --- a/include/linux/nvme-tcp.h +++ b/include/linux/nvme-tcp.h @@ -115,8 +115,9 @@ struct nvme_tcp_icresp_pdu { struct nvme_tcp_term_pdu { struct nvme_tcp_hdr hdr; __le16 fes; - __le32 fei; - __u8 rsvd[8]; + __le16 feil; + __le16 feiu; + __u8 rsvd[10]; }; /** |