LU-13501 lnet: Skip health and resends for single rail configs

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd.h

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index c55a3bd..950c756 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -255,7 +255,6 @@ struct ksock_tx {                   /* transmit packet */
        int            tx_nob;         /* # packet bytes */
        int            tx_resid;       /* residual bytes */
        int            tx_niov;        /* # packet kvec frags */
-       struct kvec  *tx_iov;         /* packet kvec frags */
         int            tx_nkiov;       /* # packet page frags */
         unsigned short tx_zc_aborted;  /* aborted ZC request */
         unsigned short tx_zc_capable:1; /* payload is large enough for ZC */
@@ -568,6 +567,13 @@ ksocknal_peer_decref(struct ksock_peer_ni *peer_ni)
                ksocknal_destroy_peer(peer_ni);
 }
 
+static inline int ksocknal_timeout(void)
+{
+       return *ksocknal_tunables.ksnd_timeout ?
+               *ksocknal_tunables.ksnd_timeout :
+               lnet_get_lnd_timeout();
+}
+
 int ksocknal_startup(struct lnet_ni *ni);
 void ksocknal_shutdown(struct lnet_ni *ni);
 int ksocknal_ctl(struct lnet_ni *ni, unsigned int cmd, void *arg);
@@ -634,7 +640,7 @@ extern void ksocknal_lib_reset_callback(struct socket *sock,
 extern void ksocknal_lib_push_conn(struct ksock_conn *conn);
 extern int ksocknal_lib_get_conn_addrs(struct ksock_conn *conn);
 extern int ksocknal_lib_setup_sock(struct socket *so);
-extern int ksocknal_lib_send_iov(struct ksock_conn *conn, struct ksock_tx *tx,
+extern int ksocknal_lib_send_hdr(struct ksock_conn *conn, struct ksock_tx *tx,
                                 struct kvec *scratch_iov);
 extern int ksocknal_lib_send_kiov(struct ksock_conn *conn, struct ksock_tx *tx,
                                  struct kvec *scratch_iov);