Merge branch 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / net / rds / ib.h

diff --git a/net/rds/ib.h b/net/rds/ib.h
index c5eddc2086ffa1cf7322b793387c7b6c3f1eee53..627fb79aee65b24baa7820d93b63cc3a02f2c6f5 100644 (file)
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -14,6 +14,7 @@
 
 #define RDS_IB_DEFAULT_RECV_WR         1024
 #define RDS_IB_DEFAULT_SEND_WR         256
+#define RDS_IB_DEFAULT_FR_WR           512
 
 #define RDS_IB_DEFAULT_RETRY_COUNT     2
 
@@ -122,6 +123,9 @@ struct rds_ib_connection {
        struct ib_wc            i_send_wc[RDS_IB_WC_MAX];
        struct ib_wc            i_recv_wc[RDS_IB_WC_MAX];
 
+       /* To control the number of wrs from fastreg */
+       atomic_t                i_fastreg_wrs;
+
        /* interrupt handling */
        struct tasklet_struct   i_send_tasklet;
        struct tasklet_struct   i_recv_tasklet;
@@ -345,6 +349,7 @@ int rds_ib_update_ipaddr(struct rds_ib_device *rds_ibdev, __be32 ipaddr);
 void rds_ib_add_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *conn);
 void rds_ib_remove_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *conn);
 void rds_ib_destroy_nodev_conns(void);
+void rds_ib_mr_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc);
 
 /* ib_recv.c */
 int rds_ib_recv_init(void);