Author: jhibbits
Date: Sun Dec 13 22:42:48 2020
New Revision: 368620
URL: https://svnweb.freebsd.org/changeset/base/368620
Log:
MFC r3684733:
dev/mfi: Make a seemingly bogus conditional unconditional
Summary:
r358689 attempted to fix a clang warning/error by inferring the intent
of the condition "(cdb[0] != 0x28 || cdb[0] != 0x2A)". Unfortunately, it
looks
like this broke things. Instead, fix this by making this path unconditional,
effectively reverting to the previous state.
PR: kern/251483
Modified:
stable/12/sys/dev/mfi/mfi_tbolt.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/mfi/mfi_tbolt.c
==============================================================================
--- stable/12/sys/dev/mfi/mfi_tbolt.c Sun Dec 13 22:25:54 2020
(r368619)
+++ stable/12/sys/dev/mfi/mfi_tbolt.c Sun Dec 13 22:42:48 2020
(r368620)
@@ -1109,16 +1109,12 @@ mfi_tbolt_send_frame(struct mfi_softc *sc, struct mfi_
if (hdr->cmd == MFI_CMD_PD_SCSI_IO) {
/* check for inquiry commands coming from CLI */
- if (cdb[0] != 0x28 && cdb[0] != 0x2A) {
- if ((req_desc = mfi_tbolt_build_mpt_cmd(sc, cm)) ==
- NULL) {
- device_printf(sc->mfi_dev, "Mapping from MFI "
- "to MPT Failed \n");
- return 1;
- }
+ if ((req_desc = mfi_tbolt_build_mpt_cmd(sc, cm)) ==
+ NULL) {
+ device_printf(sc->mfi_dev, "Mapping from MFI "
+ "to MPT Failed \n");
+ return 1;
}
- else
- device_printf(sc->mfi_dev, "DJA NA XXX SYSPDIO\n");
} else if (hdr->cmd == MFI_CMD_LD_SCSI_IO ||
hdr->cmd == MFI_CMD_LD_READ || hdr->cmd == MFI_CMD_LD_WRITE) {
cm->cm_flags |= MFI_CMD_SCSI;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
