Update to kernel headers v4.10.
Test: Built angler, booted on angler, ran bionic unit tests.
Change-Id: Ia24511e74106116ea84b44ab724865ec492de8f9
diff --git a/libc/kernel/uapi/scsi/fc/fc_fs.h b/libc/kernel/uapi/scsi/fc/fc_fs.h
index bdc617e..647e844 100644
--- a/libc/kernel/uapi/scsi/fc/fc_fs.h
+++ b/libc/kernel/uapi/scsi/fc/fc_fs.h
@@ -122,135 +122,136 @@
FC_TYPE_CT = 0x20,
FC_TYPE_ILS = 0x22,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_TYPE_NVME = 0x28,
};
-#define FC_TYPE_NAMES_INIT {[FC_TYPE_BLS] = "BLS",[FC_TYPE_ELS] = "ELS",[FC_TYPE_IP] = "IP",[FC_TYPE_FCP] = "FCP",[FC_TYPE_CT] = "CT",[FC_TYPE_ILS] = "ILS", \
+#define FC_TYPE_NAMES_INIT {[FC_TYPE_BLS] = "BLS",[FC_TYPE_ELS] = "ELS",[FC_TYPE_IP] = "IP",[FC_TYPE_FCP] = "FCP",[FC_TYPE_CT] = "CT",[FC_TYPE_ILS] = "ILS",[FC_TYPE_NVME] = "NVME", \
}
#define FC_XID_UNKNOWN 0xffff
-#define FC_XID_MIN 0x0
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define FC_XID_MIN 0x0
#define FC_XID_MAX 0xfffe
#define FC_FC_EX_CTX (1 << 23)
#define FC_FC_SEQ_CTX (1 << 22)
-#define FC_FC_FIRST_SEQ (1 << 21)
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define FC_FC_FIRST_SEQ (1 << 21)
#define FC_FC_LAST_SEQ (1 << 20)
#define FC_FC_END_SEQ (1 << 19)
#define FC_FC_END_CONN (1 << 18)
-#define FC_FC_RES_B17 (1 << 17)
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define FC_FC_RES_B17 (1 << 17)
#define FC_FC_SEQ_INIT (1 << 16)
#define FC_FC_X_ID_REASS (1 << 15)
#define FC_FC_X_ID_INVAL (1 << 14)
-#define FC_FC_ACK_1 (1 << 12)
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define FC_FC_ACK_1 (1 << 12)
#define FC_FC_ACK_N (2 << 12)
#define FC_FC_ACK_0 (3 << 12)
#define FC_FC_RES_B11 (1 << 11)
-#define FC_FC_RES_B10 (1 << 10)
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define FC_FC_RES_B10 (1 << 10)
#define FC_FC_RETX_SEQ (1 << 9)
#define FC_FC_UNI_TX (1 << 8)
#define FC_FC_CONT_SEQ(i) ((i) << 6)
-#define FC_FC_ABT_SEQ(i) ((i) << 4)
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define FC_FC_ABT_SEQ(i) ((i) << 4)
#define FC_FC_REL_OFF (1 << 3)
#define FC_FC_RES2 (1 << 2)
#define FC_FC_FILL(i) ((i) & 3)
-struct fc_ba_acc {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct fc_ba_acc {
__u8 ba_seq_id_val;
#define FC_BA_SEQ_ID_VAL 0x80
__u8 ba_seq_id;
- __u8 ba_resvd[2];
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u8 ba_resvd[2];
__be16 ba_ox_id;
__be16 ba_rx_id;
__be16 ba_low_seq_cnt;
- __be16 ba_high_seq_cnt;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __be16 ba_high_seq_cnt;
};
struct fc_ba_rjt {
__u8 br_resvd;
- __u8 br_reason;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u8 br_reason;
__u8 br_explan;
__u8 br_vendor;
};
-enum fc_ba_rjt_reason {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+enum fc_ba_rjt_reason {
FC_BA_RJT_NONE = 0,
FC_BA_RJT_INVL_CMD = 0x01,
FC_BA_RJT_LOG_ERR = 0x03,
- FC_BA_RJT_LOG_BUSY = 0x05,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_BA_RJT_LOG_BUSY = 0x05,
FC_BA_RJT_PROTO_ERR = 0x07,
FC_BA_RJT_UNABLE = 0x09,
FC_BA_RJT_VENDOR = 0xff,
-};
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
enum fc_ba_rjt_explan {
FC_BA_RJT_EXP_NONE = 0x00,
FC_BA_RJT_INV_XID = 0x03,
- FC_BA_RJT_ABT = 0x05,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_BA_RJT_ABT = 0x05,
};
struct fc_pf_rjt {
__u8 rj_action;
- __u8 rj_reason;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u8 rj_reason;
__u8 rj_resvd;
__u8 rj_vendor;
};
-enum fc_pf_rjt_reason {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+enum fc_pf_rjt_reason {
FC_RJT_NONE = 0,
FC_RJT_INVL_DID = 0x01,
FC_RJT_INVL_SID = 0x02,
- FC_RJT_P_UNAV_T = 0x03,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_RJT_P_UNAV_T = 0x03,
FC_RJT_P_UNAV = 0x04,
FC_RJT_CLS_UNSUP = 0x05,
FC_RJT_DEL_USAGE = 0x06,
- FC_RJT_TYPE_UNSUP = 0x07,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_RJT_TYPE_UNSUP = 0x07,
FC_RJT_LINK_CTL = 0x08,
FC_RJT_R_CTL = 0x09,
FC_RJT_F_CTL = 0x0a,
- FC_RJT_OX_ID = 0x0b,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_RJT_OX_ID = 0x0b,
FC_RJT_RX_ID = 0x0c,
FC_RJT_SEQ_ID = 0x0d,
FC_RJT_DF_CTL = 0x0e,
- FC_RJT_SEQ_CNT = 0x0f,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_RJT_SEQ_CNT = 0x0f,
FC_RJT_PARAM = 0x10,
FC_RJT_EXCH_ERR = 0x11,
FC_RJT_PROTO = 0x12,
- FC_RJT_LEN = 0x13,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_RJT_LEN = 0x13,
FC_RJT_UNEXP_ACK = 0x14,
FC_RJT_FAB_CLASS = 0x15,
FC_RJT_LOGI_REQ = 0x16,
- FC_RJT_SEQ_XS = 0x17,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_RJT_SEQ_XS = 0x17,
FC_RJT_EXCH_EST = 0x18,
FC_RJT_FAB_UNAV = 0x1a,
FC_RJT_VC_ID = 0x1b,
- FC_RJT_CS_CTL = 0x1c,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_RJT_CS_CTL = 0x1c,
FC_RJT_INSUF_RES = 0x1d,
FC_RJT_INVL_CLS = 0x1f,
FC_RJT_PREEMT_RJT = 0x20,
- FC_RJT_PREEMT_DIS = 0x21,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_RJT_PREEMT_DIS = 0x21,
FC_RJT_MCAST_ERR = 0x22,
FC_RJT_MCAST_ET = 0x23,
FC_RJT_PRLI_REQ = 0x24,
- FC_RJT_INVL_ATT = 0x25,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ FC_RJT_INVL_ATT = 0x25,
FC_RJT_VENDOR = 0xff,
};
#define FC_DEF_E_D_TOV 2000UL
-#define FC_DEF_R_A_TOV 10000UL
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define FC_DEF_R_A_TOV 10000UL
#endif