Skip to content

Commit 54cdc2f

Browse files
committed
Revert "fabrics: decode 'current' discovery subsystem"
This reverts commit b1943d9. There many things missing for proper TP8013/8014 support in 1.x. This introduces just regressions, hence drop it. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 94812af commit 54cdc2f

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

fabrics.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,8 @@ static inline const char *adrfam_str(__u8 adrfam)
143143
}
144144

145145
static const char * const subtypes[] = {
146-
[NVME_NQN_DISC] = "discovery subsystem referral",
146+
[NVME_NQN_DISC] = "discovery subsystem",
147147
[NVME_NQN_NVME] = "nvme subsystem",
148-
[NVME_NQN_CURR] = "current subsystem",
149148
};
150149

151150
static inline const char *subtype_str(__u8 subtype)
@@ -1173,7 +1172,6 @@ static int connect_ctrl(struct nvmf_disc_rsp_page_entry *e)
11731172

11741173
switch (e->subtype) {
11751174
case NVME_NQN_DISC:
1176-
case NVME_NQN_CURR:
11771175
discover = true;
11781176
case NVME_NQN_NVME:
11791177
break;

linux/nvme.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@ static inline uint64_t le64_to_cpu(__le64 x)
7575
#define NVME_NSID_ALL 0xffffffff
7676

7777
enum nvme_subsys_type {
78-
NVME_NQN_DISC = 1, /* Referral Discovery type target subsystem */
78+
NVME_NQN_DISC = 1, /* Discovery type target subsystem */
7979
NVME_NQN_NVME = 2, /* NVME type target subsystem */
80-
NVME_NQN_CURR = 3, /* Current Discovery type target subsystem */
8180
};
8281

8382
/* Address Family codes for Discovery Log Page entry ADRFAM field */

0 commit comments

Comments
 (0)