land b1_4_bgl on HEAD (20050404_1913)

[fs/lustre-release.git] / lnet / klnds / viblnd / viblnd.c

diff --git a/lnet/klnds/viblnd/viblnd.c b/lnet/klnds/viblnd/viblnd.c
index 73542fa..7995610 100644 (file)
--- a/lnet/klnds/viblnd/viblnd.c
+++ b/lnet/klnds/viblnd/viblnd.c
@@ -56,7 +56,7 @@ void vibnal_assert_wire_constants (void)
 
         /* Constants... */
         CLASSERT (IBNAL_MSG_MAGIC == 0x0be91b91);
-        CLASSERT (IBNAL_MSG_VERSION == 5);
+        CLASSERT (IBNAL_MSG_VERSION == 6);
         CLASSERT (IBNAL_MSG_CONNREQ == 0xc0);
         CLASSERT (IBNAL_MSG_CONNACK == 0xc1);
         CLASSERT (IBNAL_MSG_NOOP == 0xd0);
@@ -128,7 +128,7 @@ void vibnal_assert_wire_constants (void)
         CLASSERT ((int)sizeof(((kib_get_msg_t *)0)->ibgm_rd) == 8);
 
         /* Checks for struct kib_completion_msg_t */
-        CLASSERT ((int)sizeof(kib_completion_msg_t) == 16);
+        CLASSERT ((int)sizeof(kib_completion_msg_t) == 12);
         CLASSERT ((int)offsetof(kib_completion_msg_t, ibcm_cookie) == 0);
         CLASSERT ((int)sizeof(((kib_completion_msg_t *)0)->ibcm_cookie) == 8);
         CLASSERT ((int)offsetof(kib_completion_msg_t, ibcm_status) == 8);
@@ -169,7 +169,7 @@ void vibnal_assert_wire_constants (void)
         CLASSERT ((int)offsetof(kib_msg_t, ibm_u.get) == 56);
         CLASSERT ((int)sizeof(((kib_msg_t *)0)->ibm_u.get) == 88);
         CLASSERT ((int)offsetof(kib_msg_t, ibm_u.completion) == 56);
-        CLASSERT ((int)sizeof(((kib_msg_t *)0)->ibm_u.completion) == 16);
+        CLASSERT ((int)sizeof(((kib_msg_t *)0)->ibm_u.completion) == 12);
 }
 
 void
@@ -1297,7 +1297,7 @@ kibnal_alloc_pages (kib_pages_t **pp, int npages, int allow_write)
 
         for (i = 0; i < npages; i++) {
                 phys_pages[i].size = PAGE_SIZE;
-                phys_pages[i].start = page_to_phys(p->ibp_pages[i]);
+                phys_pages[i].start = kibnal_page2phys(p->ibp_pages[i]);
         }
 
         VV_ACCESS_CONTROL_MASK_SET_ALL(access);