refresh

diff --git a/meta b/meta
index 5969b0ebf762ba4942106e4d6ee925ec9188f9f9..7156711899229d855aaa92274abd66cb186ee671 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 40a7f7ccf559345185d9280b087e56fdac094adf
-Head: 2d45c1edadcc7a51ac8811272f6264a5ed9df3e5
+Previous: 2773e6a8cbcc4253eeabf4774a2c0153037e137d
+Head: b212e3450f889645d13508ab107bf5f7cb5b96fe
 Applied:
   rm-build: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0
   cm_listen_handler: 56372fe5e423b7238a4db99258c1493748c0a582
   cm_poll: aa237d85e8cb72dcc30165d284f6c54255341bcc
-  cm-rej: 49689d92c0d2b3e78be3c7e6f35befd1f3fc6358
-  refresh-temp: 2d45c1edadcc7a51ac8811272f6264a5ed9df3e5
+  cm-rej: b212e3450f889645d13508ab107bf5f7cb5b96fe
 Unapplied:
   old-bld-32: bd1bd1d366e3927b7646da33e243213a5d59c235
   old-apphang: 7a6f7ff02c6035e54fc262414eb9484ea98018b9

diff --git a/patches/cm-rej b/patches/cm-rej
index 84f8dc277396d1e13f63dbdf9ed4de97e733c6ba..75b8e841b01f04e1a309c775b6cdc902b7d7fe17 100644 (file)
--- a/patches/cm-rej
+++ b/patches/cm-rej
@@ -1,5 +1,5 @@
 Bottom: 94ddedd44bd8ad0ecfff1ba0cd50383b2addafa8
-Top:    13eb109098ad33886eea1e24d0a1f0d68efaad0b
+Top:    29f0b2bf9cfb979421c1decdbb527465f119dde5
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2010-01-08 14:26:59 -0800
 
@@ -18,7 +18,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index fbdfd56..6aa0579 100644
+index fbdfd56..c8b4c20 100644
 --- a/trunk/core/al/kernel/al_cm_cep.c
 +++ b/trunk/core/al/kernel/al_cm_cep.c
 @@ -938,7 +938,6 @@ __process_rej(
@@ -29,7 +29,7 @@ index fbdfd56..6aa0579 100644
        case CEP_STATE_REP_RCVD:\r
        case CEP_STATE_REQ_MRA_SENT:\r
        case CEP_STATE_REP_MRA_SENT:\r
-@@ -955,6 +954,11 @@ __process_rej(
+@@ -955,6 +954,13 @@ __process_rej(
                p_cep->state = CEP_STATE_IDLE;\r
                break;\r
  \r
@@ -37,6 +37,8 @@ index fbdfd56..6aa0579 100644
 +              __remove_cep( p_cep );\r
 +              p_cep->state = CEP_STATE_IDLE;\r
 +              ib_put_mad( p_mad );\r
++              AL_EXIT( AL_DBG_CM );\r
++              return IB_NO_MATCH;\r
 +\r
        case CEP_STATE_ESTABLISHED:\r
        case CEP_STATE_LAP_RCVD:\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f494e0e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 13eb109098ad33886eea1e24d0a1f0d68efaad0b
-Top:    29f0b2bf9cfb979421c1decdbb527465f119dde5
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2010-01-08 15:03:35 -0800
-
-Refresh of cm-rej
-
----
-
-diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 6aa0579..c8b4c20 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -958,6 +958,8 @@ __process_rej(
-               __remove_cep( p_cep );\r
-               p_cep->state = CEP_STATE_IDLE;\r
-               ib_put_mad( p_mad );\r
-+              AL_EXIT( AL_DBG_CM );\r
-+              return IB_NO_MATCH;\r
- \r
-       case CEP_STATE_ESTABLISHED:\r
-       case CEP_STATE_LAP_RCVD: