Merge tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / include / scsi / libiscsi.h

diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 4265a4bb83cd759ea79c50dbb1d36414b307f758..6ac9e17acdc4de7bbf3fa7f0abbc6a5d4e2db250 100644 (file)
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -62,6 +62,8 @@ enum {
        TMF_NOT_FOUND,
 };
 
+#define ISID_SIZE                      6
+
 /* Connection suspend "bit" */
 #define ISCSI_SUSPEND_BIT              1
 
@@ -173,6 +175,7 @@ struct iscsi_conn {
 
        /* iSCSI connection-wide sequencing */
        uint32_t                exp_statsn;
+       uint32_t                statsn;
 
        /* control data */
        int                     id;             /* CID */
@@ -213,6 +216,22 @@ struct iscsi_conn {
        int                     persistent_port;
        char                    *persistent_address;
 
+       unsigned                max_segment_size;
+       unsigned                tcp_xmit_wsf;
+       unsigned                tcp_recv_wsf;
+       uint16_t                keepalive_tmo;
+       uint16_t                local_port;
+       uint8_t                 tcp_timestamp_stat;
+       uint8_t                 tcp_nagle_disable;
+       uint8_t                 tcp_wsf_disable;
+       uint8_t                 tcp_timer_scale;
+       uint8_t                 tcp_timestamp_en;
+       uint8_t                 fragment_disable;
+       uint8_t                 ipv4_tos;
+       uint8_t                 ipv6_traffic_class;
+       uint8_t                 ipv6_flow_label;
+       uint8_t                 is_fw_assigned_ipv6;
+
        /* MIB-statistics */
        uint64_t                txdata_octets;
        uint64_t                rxdata_octets;
@@ -290,6 +309,18 @@ struct iscsi_session {
        char                    *boot_root;
        char                    *boot_nic;
        char                    *boot_target;
+       char                    *portal_type;
+       char                    *discovery_parent_type;
+       uint16_t                discovery_parent_idx;
+       uint16_t                def_taskmgmt_tmo;
+       uint16_t                tsid;
+       uint8_t                 auto_snd_tgt_disable;
+       uint8_t                 discovery_sess;
+       uint8_t                 chap_auth_en;
+       uint8_t                 discovery_logout_en;
+       uint8_t                 bidi_chap_en;
+       uint8_t                 discovery_auth_optional;
+       uint8_t                 isid[ISID_SIZE];
 
        /* control data */
        struct iscsi_transport  *tt;