These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / target / iscsi / iscsi_target_erl0.c

diff --git a/kernel/drivers/target/iscsi/iscsi_target_erl0.c b/kernel/drivers/target/iscsi/iscsi_target_erl0.c
index 959a14c..210f6e4 100644 (file)
--- a/kernel/drivers/target/iscsi/iscsi_target_erl0.c
+++ b/kernel/drivers/target/iscsi/iscsi_target_erl0.c
@@ -956,56 +956,3 @@ void iscsit_take_action_for_connection_exit(struct iscsi_conn *conn)
 
        iscsit_handle_connection_cleanup(conn);
 }
-
-/*
- *     This is the simple function that makes the magic of
- *     sync and steering happen in the follow paradoxical order:
- *
- *     0) Receive conn->of_marker (bytes left until next OFMarker)
- *        bytes into an offload buffer.  When we pass the exact number
- *        of bytes in conn->of_marker, iscsit_dump_data_payload() and hence
- *        rx_data() will automatically receive the identical u32 marker
- *        values and store it in conn->of_marker_offset;
- *     1) Now conn->of_marker_offset will contain the offset to the start
- *        of the next iSCSI PDU.  Dump these remaining bytes into another
- *        offload buffer.
- *     2) We are done!
- *        Next byte in the TCP stream will contain the next iSCSI PDU!
- *        Cool Huh?!
- */
-int iscsit_recover_from_unknown_opcode(struct iscsi_conn *conn)
-{
-       /*
-        * Make sure the remaining bytes to next maker is a sane value.
-        */
-       if (conn->of_marker > (conn->conn_ops->OFMarkInt * 4)) {
-               pr_err("Remaining bytes to OFMarker: %u exceeds"
-                       " OFMarkInt bytes: %u.\n", conn->of_marker,
-                               conn->conn_ops->OFMarkInt * 4);
-               return -1;
-       }
-
-       pr_debug("Advancing %u bytes in TCP stream to get to the"
-                       " next OFMarker.\n", conn->of_marker);
-
-       if (iscsit_dump_data_payload(conn, conn->of_marker, 0) < 0)
-               return -1;
-
-       /*
-        * Make sure the offset marker we retrived is a valid value.
-        */
-       if (conn->of_marker_offset > (ISCSI_HDR_LEN + (ISCSI_CRC_LEN * 2) +
-           conn->conn_ops->MaxRecvDataSegmentLength)) {
-               pr_err("OfMarker offset value: %u exceeds limit.\n",
-                       conn->of_marker_offset);
-               return -1;
-       }
-
-       pr_debug("Discarding %u bytes of TCP stream to get to the"
-                       " next iSCSI Opcode.\n", conn->of_marker_offset);
-
-       if (iscsit_dump_data_payload(conn, conn->of_marker_offset, 0) < 0)
-               return -1;
-
-       return 0;
-}