Reverted changes to files for which stale copies were accidentally

committed in revision 84.

git-svn-id: svn://openib.tc.cornell.edu/gen1@98 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/inc/iba/ib_types.h b/trunk/inc/iba/ib_types.h
index e31965392b343cf75642f38bb0aae23a7928b207..2dfbbc9b72f6f1a94e78899a902bb81d03c0e898 100644 (file)
--- a/trunk/inc/iba/ib_types.h
+++ b/trunk/inc/iba/ib_types.h
@@ -4939,9 +4939,15 @@ typedef struct _ib_vl_arb_table_record
 #include <complib/cl_packoff.h>\r
 /************/\r
 \r
-/*\r
- *     Global route header information received with unreliable datagram messages\r
- */\r
+/****s* IBA Base: Types/ib_grh_t\r
+* NAME\r
+*      ib_grh_t\r
+*\r
+* DESCRIPTION\r
+*      Global route header information received with unreliable datagram messages\r
+*\r
+* SYNOPSIS\r
+*/\r
 #include <complib/cl_packon.h>\r
 typedef struct _ib_grh\r
 {\r
@@ -4954,6 +4960,7 @@ typedef struct _ib_grh
 \r
 }      PACK_SUFFIX ib_grh_t;\r
 #include <complib/cl_packoff.h>\r
+/************/\r
 \r
 /****f* IBA Base: Types/ib_grh_get_ver_class_flow\r
 * NAME\r

diff --git a/trunk/tests/alts/registermemregion.c b/trunk/tests/alts/registermemregion.c
index dee9813b7ed59f402453006650efa2f762caa6bb..ca3ff6e7565041b0d531a35fd9733a34bb0c28d2 100644 (file)
--- a/trunk/tests/alts/registermemregion.c
+++ b/trunk/tests/alts/registermemregion.c
@@ -147,6 +147,24 @@ al_test_register_mem(
                        break;\r
                }\r
 \r
+               if(alts_mr_attr.lkey !=  lkey || alts_mr_attr.rkey !=  rkey)\r
+               {\r
+                       \r
+                       ALTS_PRINT( ALTS_DBG_ERROR,\r
+                               ("ib_query_mr failed lkey rkey different from reg\n"));\r
+                       ALTS_PRINT( ALTS_DBG_ERROR,\r
+                               ("\t\t reg-lkey = %x  query-lkey %x reg-rkey%x query-rkey%x\n" ,\r
+                               alts_mr_attr.lkey , lkey , alts_mr_attr.rkey ,  rkey));\r
+                       alts_close_ca(h_ca);\r
+                       ib_status = IB_INVALID_LKEY;\r
+                       break;\r
+                       \r
+               }\r
+\r
+               ALTS_PRINT( ALTS_DBG_ERROR,\r
+                       ("ib_query_mr passed\n"\r
+                       "\t\t lkey = %x    rkey%x query-rkey%x\n" ,\r
+                        lkey, rkey));\r
                /*\r
                 * Re-register the memeory region\r
                 */\r
@@ -158,6 +176,8 @@ al_test_register_mem(
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r
                                ("ib_rereg_mem failed status = %s\n", ib_get_err_str(ib_status)) );\r
+                       alts_close_ca(h_ca);\r
+                       break;\r
                }\r
 \r
                ALTS_PRINT( ALTS_DBG_ERROR,\r

diff --git a/trunk/tests/alts/user/alts_main.c b/trunk/tests/alts/user/alts_main.c
index ef97cc39a111795ff7c1aec5654f4a92b54e2508..d7dd1fdfa2728a6c3d12e89c81e6fffd14049ee9 100644 (file)
--- a/trunk/tests/alts/user/alts_main.c
+++ b/trunk/tests/alts/user/alts_main.c
@@ -212,9 +212,7 @@ ib_api_status_t ib_status = IB_ERROR;
                ib_status = al_test_create_mem_window();\r
                break;\r
        case RegisterSharedMemRegion:\r
-               CL_PRINT( ALTS_DBG_VERBOSE, alts_dbg_lvl,\r
-                       ("altsapp: RegisterSharedMemRegion not implemented.\n") );\r
-               ib_status = IB_SUCCESS;\r
+               ib_status = al_test_register_shared_mem();\r
                break;\r
        case MultiSend:\r
                ib_status = al_test_multi_send_recv();\r

diff --git a/trunk/tests/dirs b/trunk/tests/dirs
index 63b7b0601016d31e63d5fb677de1f14a5243ea83..c6d5952581f3abe9a7e5d7d74e6f254f8b85d236 100644 (file)
--- a/trunk/tests/dirs
+++ b/trunk/tests/dirs
@@ -1,6 +1,4 @@
 DIRS=\\r
        alts    \\r
        cmtest  \\r
-       srp             \\r
-       wsd             \\r
-       limits\r
+       wsd\r

diff --git a/trunk/tools/vstat/dirs b/trunk/tools/vstat/dirs
index 389156fd2c7f52c1116a6639091f56ab1aeadffc..5a7e8b31b0b07e3751c3a29a494f648ee8ae5130 100644 (file)
--- a/trunk/tools/vstat/dirs
+++ b/trunk/tools/vstat/dirs
@@ -1,2 +1,2 @@
-DIRS=\\r
-       user\r
+DIRS=\
+       user

diff --git a/trunk/tools/vstat/user/makefile b/trunk/tools/vstat/user/makefile
index 9c985f57bc6a7c054e47a7b8a63af4dca9ce53dd..58189757d61c2c805ec47a954e17e83d8f54e0bd 100644 (file)
--- a/trunk/tools/vstat/user/makefile
+++ b/trunk/tools/vstat/user/makefile
@@ -1,7 +1,7 @@
-#\r
-# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source\r
-# file to this component.  This file merely indirects to the real make file\r
-# that is shared by all the driver components of the Windows NT DDK\r
-#\r
-\r
-!INCLUDE $(NTMAKEENV)\makefile.def\r
+#
+# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source
+# file to this component.  This file merely indirects to the real make file
+# that is shared by all the driver components of the Windows NT DDK
+#
+
+!INCLUDE $(NTMAKEENV)\makefile.def

diff --git a/trunk/tools/vstat/user/vstat.rc b/trunk/tools/vstat/user/vstat.rc
index 717ac828fd4d1a2fdecccc2b6e18f6c4cdcc372d..0bd0bfcf0824c95b12056cceddf056f9fe90d06b 100644 (file)
--- a/trunk/tools/vstat/user/vstat.rc
+++ b/trunk/tools/vstat/user/vstat.rc
@@ -1,47 +1,47 @@
-/*\r
- * Copyright (c) 2005 Mellanox Technologies.  All rights reserved.\r
- *\r
- * This software is available to you under the OpenIB.org BSD license\r
- * below:\r
- *\r
- *     Redistribution and use in source and binary forms, with or\r
- *     without modification, are permitted provided that the following\r
- *     conditions are met:\r
- *\r
- *      - Redistributions of source code must retain the above\r
- *        copyright notice, this list of conditions and the following\r
- *        disclaimer.\r
- *\r
- *      - Redistributions in binary form must reproduce the above\r
- *        copyright notice, this list of conditions and the following\r
- *        disclaimer in the documentation and/or other materials\r
- *        provided with the distribution.\r
- *\r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
- * SOFTWARE.\r
- *\r
- * $Id$\r
- */\r
-\r
-\r
-#include <ics_ver.h>\r
-\r
-#define VER_FILETYPE                           VFT_APP\r
-#define VER_FILESUBTYPE                                VFT2_UNKNOWN\r
-\r
-#ifdef _DEBUG_\r
-#define VER_FILEDESCRIPTION_STR                "HCA Status Report Application (Debug)"\r
-#else\r
-#define VER_FILEDESCRIPTION_STR                "HCA Status Report Application"\r
-#endif\r
-\r
-#define VER_INTERNALNAME_STR           "vstat.exe"\r
-#define VER_ORIGINALFILENAME_STR       "vstat.exe"\r
-\r
-#include <common.ver>\r
+/*
+ * Copyright (c) 2005 Mellanox Technologies.  All rights reserved.
+ *
+ * This software is available to you under the OpenIB.org BSD license
+ * below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * $Id$
+ */
+
+
+#include <ics_ver.h>
+
+#define VER_FILETYPE                           VFT_APP
+#define VER_FILESUBTYPE                                VFT2_UNKNOWN
+
+#ifdef _DEBUG_
+#define VER_FILEDESCRIPTION_STR                "HCA Status Report Application (Debug)"
+#else
+#define VER_FILEDESCRIPTION_STR                "HCA Status Report Application"
+#endif
+
+#define VER_INTERNALNAME_STR           "vstat.exe"
+#define VER_ORIGINALFILENAME_STR       "vstat.exe"
+
+#include <common.ver>

diff --git a/trunk/tools/vstat/user/vstat_main.c b/trunk/tools/vstat/user/vstat_main.c
index 93eb64a0583a677a72d1a3061c48d81d2791c469..bbcb40f493aabe042d85587f3a9bf4e93ff1583b 100644 (file)
--- a/trunk/tools/vstat/user/vstat_main.c
+++ b/trunk/tools/vstat/user/vstat_main.c
@@ -106,13 +106,36 @@ void printPortLinkState(int portState){ //TODO: check that these are all the opt
 }\r
 \r
 \r
+\r
+void printPortMTU(int mtu){ //TODO: check that these are all the options and that they are correct\r
+       switch(mtu){\r
+               case 1:\r
+                       printf("\t\tmax_mtu=256\n");\r
+                       break;\r
+               case 2:\r
+                       printf("\t\tmax_mtu=512\n");\r
+                       break;\r
+               case 3:\r
+                       printf("\t\tmax_mtu=1024\n");\r
+                       break;\r
+               case 4:\r
+                       printf("\t\tmax_mtu=2048\n");\r
+                       break;\r
+               case 5:\r
+                       printf("\t\tmax_mtu=4096\n");\r
+                       break;\r
+               default:\r
+                       printf("\t\tmax_mtu=UNKNOWN\n"); \r
+       }\r
+}\r
+\r
 void printPortInfo(ib_port_attr_t* portPtr, BOOLEAN fullPrint){\r
        printf("\t\tport=%d\n", portPtr->port_num);\r
        printPortLinkState(portPtr->link_state);\r
        printf("\t\tsm_lid=0x%04x\n", cl_ntoh16(portPtr->sm_lid));\r
        printf("\t\tport_lid=0x%04x\n", cl_ntoh16(portPtr->lid));\r
        printf("\t\tport_lmc=0x%x\n", portPtr->lmc);\r
-       printf("\t\tmax_mtu=%d\n", portPtr->mtu);\r
+       printPortMTU(portPtr->mtu);\r
        if(fullPrint){\r
                printf("\t\tmax_msg_sz=0x%x     (Max message size)\n", portPtr->max_msg_size);\r
                printf("\t\tcapability_mask=TBD\n");\r

diff --git a/trunk/ulp/srp/dirs b/trunk/ulp/srp/dirs
index ddf0ed7df3543dba244a417789c55225e1b97de4..ed41dcf407f9f3e6e885f3024236d66b4100297b 100644 (file)
--- a/trunk/ulp/srp/dirs
+++ b/trunk/ulp/srp/dirs
@@ -1,3 +1,2 @@
 DIRS=\\r
-       user    \\r
        kernel\r