refresh

diff --git a/meta b/meta
index 45f17c56c0881acac67b80e0b9076b01eb2c7c80..8bb078172566311397f59010722a7d4b98b3da36 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 22bde5a4addeeef7400c24a10f45d5ab65777708
-Head: 6eb9501efa873d8ada9e799f67a003d80bff8ee9
+Previous: 7ecd42664c7a5ef440fb19ba97e89cfe472add55
+Head: 73c7d147389d592bd9927bc3c2c366dde7beb1dd
 Applied:
   rm-build: 55c53dc74f83d371ca0578662774c16c10847dc0
   bld-32: 4f8ab24b82adb00b15f181d1fa2cf30ca46d6b4b
   apphang: 39363d3efa43131e2aeb49b42f74b6e446e8b388
-  cm_send_cb: 30ad14a49bfd8e316959952d8fcd3b35ea566e4c
-  refresh-temp: 6eb9501efa873d8ada9e799f67a003d80bff8ee9
+  cm_send_cb: 73c7d147389d592bd9927bc3c2c366dde7beb1dd
 Unapplied:
   queue_mads: a9c572c34ae693764a33e87173125d3065a6d1c5
   epdisc: 4c931f6af5e37a502f7a10b78a902747f9738623

diff --git a/patches/cm_send_cb b/patches/cm_send_cb
index 520b17c6a97ae22895c587b6ac60d3c8856da68f..8f317eedd8f52fa40e09804e77add4e653ea4eb7 100644 (file)
--- a/patches/cm_send_cb
+++ b/patches/cm_send_cb
@@ -1,5 +1,5 @@
 Bottom: 7784f453d39829ad87057d6488280ca48821ba8c
-Top:    71d8cf1ad32d88b92c8abddfc3b3206fb073519e
+Top:    3b5ec293e40370fd38c82db492b29d3e260e4a0b
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2009-12-07 10:36:50 -0800
 
@@ -44,7 +44,7 @@ index 48b0cb5..955985a 100644
  }     iba_cm_id_priv;\r
  \r
 diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 49fa417..4749e1d 100644
+index 49fa417..4987207 100644
 --- a/trunk/core/al/kernel/al_cm_cep.c
 +++ b/trunk/core/al/kernel/al_cm_cep.c
 @@ -27,7 +27,7 @@
@@ -56,7 +56,7 @@ index 49fa417..4749e1d 100644
   */\r
  \r
  \r
-@@ -2213,105 +2213,79 @@ __cep_mad_send_cb(
+@@ -2213,10 +2213,7 @@ __cep_mad_send_cb(
  \r
        p_cep = (kcep_t*)p_mad->context1;\r
  \r
@@ -64,12 +64,11 @@ index 49fa417..4749e1d 100644
 -       * The connection context is not set when performing immediate responses,\r
 -       * such as repeating MADS.\r
 -       */\r
--      if( !p_cep )\r
 +      /* The cep context is only set for MADs that are retried. */\r
-+      if( !p_cep  )\r
+       if( !p_cep )\r
        {\r
                ib_put_mad( p_mad );\r
-               AL_EXIT( AL_DBG_CM );\r
+@@ -2224,94 +2221,71 @@ __cep_mad_send_cb(
                return;\r
        }\r
  \r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6e19eed..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 71d8cf1ad32d88b92c8abddfc3b3206fb073519e
-Top:    3b5ec293e40370fd38c82db492b29d3e260e4a0b
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2010-01-04 10:17:43 -0800
-
-Refresh of cm_send_cb
-
----
-
-diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 4749e1d..4987207 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -2214,7 +2214,7 @@ __cep_mad_send_cb(
-       p_cep = (kcep_t*)p_mad->context1;\r
- \r
-       /* The cep context is only set for MADs that are retried. */\r
--      if( !p_cep  )\r
-+      if( !p_cep )\r
-       {\r
-               ib_put_mad( p_mad );\r
-               AL_EXIT( AL_DBG_CM );