LU-6142 lnd: create enum kib_dev_caps

Cleanup IBLND_DEV_CAPS_* by creating enum kib_dev_caps and using
the BIT() macros.

Change-Id: Ia3feaa0a0a98d5621686cddf9cb02af50f42f78c
Test-Parameters: trivial
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/33409
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Amir Shehata <ashehata@whamcloud.com>
Reviewed-by: Doug Oucharek <dougso@me.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c
index 4ebc9a5..98818ed 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/lnet/klnds/o2iblnd/o2iblnd.c
@@ -733,7 +733,7 @@ static unsigned int kiblnd_send_wrs(struct kib_conn *conn)
         * And ibc_max_frags for the transfer WRs
         */
        unsigned int ret = 1 + conn->ibc_max_frags;
-       __u32 dev_caps = conn->ibc_hdev->ibh_dev->ibd_dev_caps;
+       enum kib_dev_caps dev_caps = conn->ibc_hdev->ibh_dev->ibd_dev_caps;
 
        /* FastReg needs two extra WRs for map and invalidate */
        if (dev_caps & IBLND_DEV_CAPS_FASTREG_ENABLED)
@@ -1546,7 +1546,7 @@ static int kiblnd_alloc_fmr_pool(struct kib_fmr_poolset *fps,
 
 static int kiblnd_alloc_freg_pool(struct kib_fmr_poolset *fps,
                                  struct kib_fmr_pool *fpo,
-                                 __u32 dev_caps)
+                                 enum kib_dev_caps dev_caps)
 {
        struct kib_fast_reg_descriptor *frd, *tmp;
        int i, rc;

diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h
index fa87dd1..ddee13d 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/lnet/klnds/o2iblnd/o2iblnd.h
@@ -89,10 +89,6 @@
 #define IBLND_N_SCHED                  2
 #define IBLND_N_SCHED_HIGH             4
 
-#define IBLND_DEV_CAPS_FASTREG_ENABLED         0x1
-#define IBLND_DEV_CAPS_FASTREG_GAPS_SUPPORT    0x2
-#define IBLND_DEV_CAPS_FMR_ENABLED             0x4
-
 struct kib_tunables {
        int              *kib_dev_failover;     /* HCA failover */
        unsigned int     *kib_service;          /* IB service number */
@@ -178,6 +174,12 @@ struct kib_hca_dev;
 #define KIB_IFNAME_SIZE              256
 #endif
 
+enum kib_dev_caps {
+       IBLND_DEV_CAPS_FASTREG_ENABLED          = BIT(0),
+       IBLND_DEV_CAPS_FASTREG_GAPS_SUPPORT     = BIT(1),
+       IBLND_DEV_CAPS_FMR_ENABLED              = BIT(2),
+};
+
 struct kib_dev {
        struct list_head        ibd_list;       /* chain on kib_devs */
        struct list_head        ibd_fail_list;  /* chain on kib_failed_devs */
@@ -195,7 +197,7 @@ struct kib_dev {
        unsigned int            ibd_can_failover;
        struct list_head        ibd_nets;
        struct kib_hca_dev      *ibd_hdev;
-       __u32                   ibd_dev_caps;
+       enum kib_dev_caps       ibd_dev_caps;
 };
 
 struct kib_hca_dev {