refresh

diff --git a/meta b/meta
index 3da6351c0e1509048915341d8ff057fc3fe6dc3c..599c8effe69b801ccc9e709d96b2ce64401fe2e7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: b764e83489429e4c9637deb830dc38bed6245a45
-Head: 7df2839c7fea42bdce554f685caee91a79eda583
+Previous: 45f6494cd05705d298e105a5abab90a4f3b3a485
+Head: e0ae14f599dafa9f416feabc6457981dcc4dd81b
 Applied:
   rm-build: 55c53dc74f83d371ca0578662774c16c10847dc0
   bld-32: 4f8ab24b82adb00b15f181d1fa2cf30ca46d6b4b
   apphang: 39363d3efa43131e2aeb49b42f74b6e446e8b388
-  debug: c9e316cc576721619b5a0b203f40bd0d887cae6d
-  refresh-temp: 7df2839c7fea42bdce554f685caee91a79eda583
+  debug: e0ae14f599dafa9f416feabc6457981dcc4dd81b
 Unapplied:
   ib_cm_dreq: 31783762cd411bd29a6f46be963978317dc74eb8
   epdisc: 4c931f6af5e37a502f7a10b78a902747f9738623

diff --git a/patches/debug b/patches/debug
index d067caa079b00cf49b87d82f8e488b9db2cbeb12..6ab6c9f3fc02aad803a1ecb13f6092d5d5ddeb26 100644 (file)
--- a/patches/debug
+++ b/patches/debug
@@ -1,5 +1,5 @@
 Bottom: 7784f453d39829ad87057d6488280ca48821ba8c
-Top:    1b3dbbaafafc7ebd9d86f2f811438dd8f593a479
+Top:    d78eca6ac87c6b053479b9aa7d943c5abe09b17f
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2009-12-07 10:36:50 -0800
 
@@ -64,7 +64,7 @@ index 48b0cb5..a3649bc 100644
  }\r
  \r
 diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 49fa417..dbb93ff 100644
+index 49fa417..bca10ac 100644
 --- a/trunk/core/al/kernel/al_cm_cep.c
 +++ b/trunk/core/al/kernel/al_cm_cep.c
 @@ -27,7 +27,7 @@
@@ -136,15 +136,22 @@ index 49fa417..dbb93ff 100644
                        p_cep->state = CEP_STATE_DESTROY;\r
                        __insert_timewait( p_cep );\r
                        /* Fall through. */\r
-@@ -2288,6 +2299,7 @@ __cep_mad_send_cb(
+@@ -2288,6 +2299,14 @@ __cep_mad_send_cb(
                         */\r
                        __format_mad_hdr( &p_cep->mads.drep.hdr, p_cep, CM_DREP_ATTR_ID );\r
                        __format_drep( p_cep, NULL, 0, &p_cep->mads.drep );\r
++DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "__cep_mad_send_cb cid 0x%x, attr 0x%x status 0x%x DREQ_SENT->TIMEWAIT\n",\r
++   p_cep->cid, attr_id, mad_status);\r
 +p_cep->old_state[1] = p_cep->state | 0x30000000;\r
++                      if( p_cep->p_send_mad )\r
++                      {\r
++                              ib_cancel_mad(h_mad_svc, p_cep->p_send_mad);\r
++                              p_cep->p_send_mad = NULL;\r
++                      }\r
                        p_cep->state = CEP_STATE_TIMEWAIT;\r
                        __insert_timewait( p_cep );\r
                        break;\r
-@@ -2317,7 +2329,13 @@ done:
+@@ -2317,7 +2336,13 @@ done:
        cep_context = p_cep->context;\r
  \r
        if( !cl_atomic_dec( &p_cep->ref_cnt ) && pfn_destroy_cb )\r
@@ -158,7 +165,7 @@ index 49fa417..dbb93ff 100644
        AL_EXIT( AL_DBG_CM );\r
  }\r
  \r
-@@ -3941,6 +3959,7 @@ __cleanup_cep(
+@@ -3941,6 +3966,7 @@ __cleanup_cep(
        if( p_cep->state == CEP_STATE_DESTROY ||\r
                p_cep->state == CEP_STATE_DREQ_DESTROY )\r
        {\r
@@ -166,7 +173,7 @@ index 49fa417..dbb93ff 100644
                AL_EXIT( AL_DBG_CM );\r
                return -1;\r
        }\r
-@@ -4041,10 +4060,12 @@ __cleanup_cep(
+@@ -4041,10 +4067,12 @@ __cleanup_cep(
                AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("CEP in state %d.\n", p_cep->state) );\r
        case CEP_STATE_TIMEWAIT:\r
                /* Already in timewait - so all is good. */\r
@@ -179,7 +186,7 @@ index 49fa417..dbb93ff 100644
        p_cep->state = CEP_STATE_DESTROY;\r
        __insert_timewait( p_cep );\r
  \r
-@@ -5282,6 +5303,7 @@ al_cep_rej(
+@@ -5282,6 +5310,7 @@ al_cep_rej(
        case CEP_STATE_REP_MRA_SENT:\r
                status = __do_cep_rej(\r
                        p_cep, rej_status, p_ari, ari_len, p_pdata, pdata_len );\r
@@ -187,7 +194,7 @@ index 49fa417..dbb93ff 100644
                p_cep->state = CEP_STATE_TIMEWAIT;\r
                __insert_timewait( p_cep );\r
                break;\r
-@@ -5801,6 +5823,7 @@ al_cep_dreq(
+@@ -5801,6 +5830,7 @@ al_cep_dreq(
                }\r
                else\r
                {\r
@@ -195,7 +202,7 @@ index 49fa417..dbb93ff 100644
                        p_cep->state = CEP_STATE_TIMEWAIT;\r
                        __insert_timewait( p_cep );\r
                }\r
-@@ -5859,11 +5882,14 @@ al_cep_drep(
+@@ -5859,11 +5889,14 @@ al_cep_drep(
                        break;\r
  \r
                __cep_send_mad( p_port_cep, p_mad );\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d414568..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,28 +0,0 @@
-Bottom: 1b3dbbaafafc7ebd9d86f2f811438dd8f593a479
-Top:    d78eca6ac87c6b053479b9aa7d943c5abe09b17f
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2009-12-16 19:13:14 -0800
-
-Refresh of debug
-
----
-
-diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index dbb93ff..bca10ac 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -2299,7 +2299,14 @@ p_cep->old_state[0] = p_cep->state;
-                        */\r
-                       __format_mad_hdr( &p_cep->mads.drep.hdr, p_cep, CM_DREP_ATTR_ID );\r
-                       __format_drep( p_cep, NULL, 0, &p_cep->mads.drep );\r
-+DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "__cep_mad_send_cb cid 0x%x, attr 0x%x status 0x%x DREQ_SENT->TIMEWAIT\n",\r
-+   p_cep->cid, attr_id, mad_status);\r
- p_cep->old_state[1] = p_cep->state | 0x30000000;\r
-+                      if( p_cep->p_send_mad )\r
-+                      {\r
-+                              ib_cancel_mad(h_mad_svc, p_cep->p_send_mad);\r
-+                              p_cep->p_send_mad = NULL;\r
-+                      }\r
-                       p_cep->state = CEP_STATE_TIMEWAIT;\r
-                       __insert_timewait( p_cep );\r
-                       break;