* vibnal fixes

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

diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h
index 5cb1640..0252cff 100644 (file)
--- a/lnet/klnds/ralnd/ralnd.h
+++ b/lnet/klnds/ralnd/ralnd.h
@@ -110,12 +110,11 @@ typedef struct
         int                     rad_id;         /* device id */
         int                     rad_idx;        /* index in kra_devices */
         int                     rad_ready;      /* set by device callback */
-        struct list_head        rad_connq;      /* connections requiring attention */
+        struct list_head        rad_ready_conns;/* connections ready to tx/rx */
+        struct list_head        rad_new_conns;  /* new connections to complete */
         wait_queue_head_t       rad_waitq;      /* scheduler waits here */
         spinlock_t              rad_lock;       /* serialise */
         void                   *rad_scheduler;  /* scheduling thread */
-        int                     rad_setri_please; /* ++ when connd wants to setri */
-        struct semaphore        rad_setri_mutex; /* serialise setri */
 } kra_device_t;
 
 typedef struct
@@ -290,27 +289,12 @@ typedef struct kra_tx                           /* message descriptor */
 #define RANAL_BUF_VIRT_UNMAPPED  4              /* virtual: not mapped yet */
 #define RANAL_BUF_VIRT_MAPPED    5              /* virtual: mapped already */
 
-#define RANAL_TX_IDLE            0x00           /* on freelist */
-#define RANAL_TX_SIMPLE          0x10           /* about to send a simple message */
-#define RANAL_TX_PUTI_REQ        0x20           /* PUT initiator about to send PUT_REQ */
-#define RANAL_TX_PUTI_WAIT_ACK   0x21           /* PUT initiator waiting for PUT_ACK */
-#define RANAL_TX_PUTI_RDMA       0x22           /* PUT initiator waiting for RDMA to complete */
-#define RANAL_TX_PUTI_DONE       0x23           /* PUT initiator about to send PUT_DONE */
-#define RANAL_TX_PUTT_NAK        0x30           /* PUT target about to send PUT_NAK */
-#define RANAL_TX_PUTT_ACK        0x30           /* PUT target about to send PUT_ACK */
-#define RANAL_TX_PUTT_WAIT_DONE  0x31           /* PUT target waiting for PUT_DONE */
-#define RANAL_TX_GETI_REQ        0x40           /* GET initiator about to send GET_REQ */
-#define RANAL_TX_GETI_WAIT_DONE  0x41           /* GET initiator waiting for GET_DONE */
-#define RANAL_TX_GETT_NAK        0x50           /* GET target about to send PUT_NAK */
-#define RANAL_TX_GETT_RDMA       0x51           /* GET target waiting for RDMA to complete */
-#define RANAL_TX_GETT_DONE       0x52           /* GET target about to send GET_DONE */
-
 typedef struct kra_conn
 {
         struct kra_peer    *rac_peer;           /* owning peer */
         struct list_head    rac_list;           /* stash on peer's conn list */
         struct list_head    rac_hashlist;       /* stash in connection hash table */
-        struct list_head    rac_schedlist;      /* schedule (on rad_connq) for attention */
+        struct list_head    rac_schedlist;      /* schedule (on rad_???_conns) for attention */
         struct list_head    rac_fmaq;           /* txs queued for FMA */
         struct list_head    rac_rdmaq;          /* txs awaiting RDMA completion */
         struct list_head    rac_replyq;         /* txs awaiting replies */