LU-13641 socklnd: remove tcp bonding

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

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index c22a0eb..cd95ea6 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -56,6 +56,8 @@
 #include <lnet/lib-lnet.h>
 #include <lnet/socklnd.h>
 
+#include <libcfs/linux/linux-net.h>
+
 #ifndef NETIF_F_CSUM_MASK
 # define NETIF_F_CSUM_MASK NETIF_F_ALL_CSUM
 #endif
@@ -109,7 +111,7 @@ struct ksock_sched {
 
 struct ksock_interface {                       /* in-use interface */
        int             ksni_index;             /* Linux interface index */
-       __u32           ksni_ipaddr;            /* interface's IP address */
+       struct sockaddr_storage ksni_addr;      /* interface's address */
        __u32           ksni_netmask;           /* interface's network mask */
        int             ksni_nroutes;           /* # routes using (active) */
        int             ksni_npeers;            /* # peers using (passive) */
@@ -160,8 +162,7 @@ struct ksock_net {
        __u64             ksnn_incarnation;     /* my epoch */
        struct list_head  ksnn_list;            /* chain on global list */
        atomic_t          ksnn_npeers;          /* # peers */
-       int               ksnn_ninterfaces;     /* IP interfaces */
-       struct ksock_interface ksnn_interfaces[LNET_INTERFACES_NUM];
+       struct ksock_interface ksnn_interface;  /* IP interface */
 };
 /* When the ksock_net is shut down, this (negative) bias is added to
  * ksnn_npeers, which prevents new peers from being added.
@@ -299,9 +300,8 @@ struct ksock_conn {
        refcount_t              ksnc_sock_refcount;     /* sock refcount */
        struct ksock_sched      *ksnc_scheduler;        /* who schedules this
                                                         * connection */
-       __u32                   ksnc_myipaddr;          /* my IP */
-       __u32                   ksnc_ipaddr;            /* peer_ni's IP */
-       int                     ksnc_port;              /* peer_ni's port */
+       struct sockaddr_storage ksnc_myaddr;            /* my address */
+       struct sockaddr_storage ksnc_peeraddr;          /*  peer_ni's address */
        signed int              ksnc_type:3;            /* type of connection,
                                                         * should be signed
                                                         * value */
@@ -367,8 +367,7 @@ struct ksock_route {
                                                 */
        time64_t                ksnr_retry_interval;/* secs between retries */
        int                     ksnr_myiface;   /* interface index */
-       __u32                   ksnr_ipaddr;    /* IP address to connect to */
-       int                     ksnr_port;      /* port to connect to */
+       struct sockaddr_storage ksnr_addr;      /* IP address to connect to */
        unsigned int            ksnr_scheduled:1;/* scheduled for attention */
        unsigned int            ksnr_connecting:1;/* connection in progress */
        unsigned int            ksnr_connected:4;/* connections by type */
@@ -575,8 +574,8 @@ int ksocknal_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,
                   unsigned int offset, unsigned int mlen, unsigned int rlen);
 int ksocknal_accept(struct lnet_ni *ni, struct socket *sock);
 
-int ksocknal_add_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ip,
-                     int port);
+int ksocknal_add_peer(struct lnet_ni *ni, struct lnet_process_id id,
+                     struct sockaddr *addr);
 struct ksock_peer_ni *ksocknal_find_peer_locked(struct lnet_ni *ni,
                                           struct lnet_process_id id);
 struct ksock_peer_ni *ksocknal_find_peer(struct lnet_ni *ni,
@@ -588,7 +587,7 @@ extern void ksocknal_close_conn_locked(struct ksock_conn *conn, int why);
 extern void ksocknal_terminate_conn(struct ksock_conn *conn);
 extern void ksocknal_destroy_conn(struct ksock_conn *conn);
 extern int  ksocknal_close_peer_conns_locked(struct ksock_peer_ni *peer_ni,
-                                            __u32 ipaddr, int why);
+                                            struct sockaddr *peer, int why);
 extern int ksocknal_close_conn_and_siblings(struct ksock_conn *conn, int why);
 int ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr);
 extern struct ksock_conn *ksocknal_find_conn_locked(struct ksock_peer_ni *peer_ni,
@@ -603,8 +602,6 @@ extern void ksocknal_next_tx_carrier(struct ksock_conn *conn);
 extern void ksocknal_queue_tx_locked(struct ksock_tx *tx, struct ksock_conn *conn);
 extern void ksocknal_txlist_done(struct lnet_ni *ni, struct list_head *txlist,
                                 int error);
-extern void ksocknal_notify(lnet_nid_t gw_nid);
-extern void ksocknal_query(struct lnet_ni *ni, lnet_nid_t nid, time64_t *when);
 extern int ksocknal_thread_start(int (*fn)(void *arg), void *arg, char *name);
 extern void ksocknal_thread_fini(void);
 extern void ksocknal_launch_all_connections_locked(struct ksock_peer_ni *peer_ni);
@@ -648,6 +645,5 @@ extern int ksocknal_tunables_init(void);
 extern void ksocknal_lib_csum_tx(struct ksock_tx *tx);
 
 extern int ksocknal_lib_memory_pressure(struct ksock_conn *conn);
-extern int ksocknal_lib_bind_thread_to_cpu(int id);
 
 #endif /* _SOCKLND_SOCKLND_H_ */