refresh

diff --git a/meta b/meta
index dbac400af29a017a089c2c45cd6971d487f7039c..22445df77add75fa866a3b87e31c2ef5b27458f8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: ee9e888dc1456301bea968e7234c2dfb3ea1b509
-Head: 718de05c643539d6ed59af4534e42618f2bdf1d8
+Previous: c670390f5d33e2bf16a3524d9798d8853be33e66
+Head: 978a5f7ea0819ecce42746e7612d3435560615d7
 Applied:
   rm-build: 55c53dc74f83d371ca0578662774c16c10847dc0
   bld-32: 4f8ab24b82adb00b15f181d1fa2cf30ca46d6b4b
   apphang: 39363d3efa43131e2aeb49b42f74b6e446e8b388
-  debug: 8aaa007ab94b17a9f9cc659362eeeeb73c8ce7f0
-  refresh-temp: 718de05c643539d6ed59af4534e42618f2bdf1d8
+  debug: 978a5f7ea0819ecce42746e7612d3435560615d7
 Unapplied:
   ib_cm_dreq: 31783762cd411bd29a6f46be963978317dc74eb8
   epdisc: 4c931f6af5e37a502f7a10b78a902747f9738623

diff --git a/patches/debug b/patches/debug
index 506ca2bcd5631ff564f5bfe5c51ca04558d0075c..76352ace5875889cf0bbd1e6aece5aac0f042b1a 100644 (file)
--- a/patches/debug
+++ b/patches/debug
@@ -1,5 +1,5 @@
 Bottom: 7784f453d39829ad87057d6488280ca48821ba8c
-Top:    ca319bddfbb13954cab2a3e2352a3275d27cb03d
+Top:    7205d797ebb8c1b0cea4413bf8a01b6a1cdc04f2
 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..4d0199d 100644
+index 49fa417..1c9671f 100644
 --- a/trunk/core/al/kernel/al_cm_cep.c
 +++ b/trunk/core/al/kernel/al_cm_cep.c
 @@ -27,7 +27,7 @@
@@ -56,41 +56,39 @@ index 49fa417..4d0199d 100644
   */\r
  \r
  \r
-@@ -2227,91 +2227,72 @@ __cep_mad_send_cb(
+@@ -2213,105 +2213,79 @@ __cep_mad_send_cb(
+ \r
+       p_cep = (kcep_t*)p_mad->context1;\r
+ \r
+-      /*\r
+-       * 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
+       {\r
+               ib_put_mad( p_mad );\r
+               AL_EXIT( AL_DBG_CM );\r
+               return;\r
+       }\r
+ \r
++      Cl_ASSERT( p_mad->status != IB_WCS_SUCCESS );\r
        p_mad->context1 = NULL;\r
  \r
        KeAcquireInStackQueuedSpinLockAtDpcLevel( &gp_cep_mgr->lock, &hdl );\r
-+      if( p_cep->p_send_mad != p_mad || p_mad->status == IB_WCS_SUCCESS)\r
-+      {\r
-+              KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
-+              ib_put_mad( p_mad );\r
-+              goto done;\r
-+      }\r
-+\r
-       /* Clear the sent MAD pointer so that we don't try cancelling again. */\r
-       if( p_cep->p_send_mad == p_mad )\r
-               p_cep->p_send_mad = NULL;\r
- \r
+-      /* Clear the sent MAD pointer so that we don't try cancelling again. */\r
+-      if( p_cep->p_send_mad == p_mad )\r
+-              p_cep->p_send_mad = NULL;\r
+-\r
 -      switch( p_mad->status )\r
-+      /* Treat as a timeout so we don't stall the state machine. */\r
-+      if( p_mad->status == IB_WCS_CANCELED)\r
-+              p_mad->status = IB_WCS_TIMEOUT_RETRY_ERR;\r
-+\r
-+      switch( p_cep->state )\r
++      if( p_cep->p_send_mad != p_mad )\r
        {\r
 -      case IB_WCS_SUCCESS:\r
--              KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
--              ib_put_mad( p_mad );\r
-+      case CEP_STATE_REQ_SENT:\r
-+      case CEP_STATE_REQ_MRA_RCVD:\r
-+      case CEP_STATE_REP_SENT:\r
-+      case CEP_STATE_REP_MRA_RCVD:\r
-+              /* Send the REJ. */\r
-+              __reject_timeout( p_port_cep, p_cep, p_mad );\r
-+              __remove_cep( p_cep );\r
-+              p_cep->state = CEP_STATE_IDLE;\r
-               break;\r
- \r
+               KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
+               ib_put_mad( p_mad );\r
+-              break;\r
+-\r
 -      case IB_WCS_CANCELED:\r
 -              if( p_cep->state != CEP_STATE_REQ_SENT &&\r
 -                      p_cep->state != CEP_STATE_REQ_MRA_RCVD &&\r
@@ -108,10 +106,7 @@ index 49fa417..4d0199d 100644
 -              /* Treat as a timeout so we don't stall the state machine. */\r
 -              p_mad->status = IB_WCS_TIMEOUT_RETRY_ERR;\r
 -\r
-+      case CEP_STATE_DREQ_DESTROY:\r
-+              p_cep->state = CEP_STATE_DESTROY;\r
-+              __insert_timewait( p_cep );\r
-               /* Fall through. */\r
+-              /* Fall through. */\r
 -      case IB_WCS_TIMEOUT_RETRY_ERR:\r
 -      default:\r
 -              /* Timeout.  Reject the connection. */\r
@@ -131,12 +126,16 @@ index 49fa417..4d0199d 100644
 -                      p_cep->state = CEP_STATE_DESTROY;\r
 -                      __insert_timewait( p_cep );\r
 -                      /* Fall through. */\r
--\r
++              goto done;\r
++      }\r
+ \r
 -              case CEP_STATE_DESTROY:\r
 -                      KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
 -                      ib_put_mad( p_mad );\r
 -                      goto done;\r
--\r
++      /* Clear the sent MAD pointer so that we don't try cancelling again. */\r
++      p_cep->p_send_mad = NULL;\r
+ \r
 -              case CEP_STATE_DREQ_SENT:\r
 -                      /*\r
 -                       * Make up a DREP mad so we can respond if we receive\r
@@ -147,7 +146,18 @@ index 49fa417..4d0199d 100644
 -                      p_cep->state = CEP_STATE_TIMEWAIT;\r
 -                      __insert_timewait( p_cep );\r
 -                      break;\r
--\r
++      switch( p_cep->state )\r
++      {\r
++      case CEP_STATE_REQ_SENT:\r
++      case CEP_STATE_REQ_MRA_RCVD:\r
++      case CEP_STATE_REP_SENT:\r
++      case CEP_STATE_REP_MRA_RCVD:\r
++              /* Send the REJ. */\r
++              __reject_timeout( p_port_cep, p_cep, p_mad );\r
++              __remove_cep( p_cep );\r
++              p_cep->state = CEP_STATE_IDLE;\r
++              break;\r
+ \r
 -              case CEP_STATE_LAP_SENT:\r
 -                      /*\r
 -                       * Before CEP was sent, we have been in CEP_STATE_ESTABLISHED as we\r
@@ -158,6 +168,10 @@ index 49fa417..4d0199d 100644
 -              default:\r
 -                      break;\r
 -              }\r
++      case CEP_STATE_DREQ_DESTROY:\r
++              p_cep->state = CEP_STATE_DESTROY;\r
++              __insert_timewait( p_cep );\r
++              /* Fall through. */\r
  \r
 -              status = __cep_queue_mad( p_cep, p_mad );\r
 -              CL_ASSERT( status != IB_INVALID_STATE );\r
@@ -200,7 +214,7 @@ index 49fa417..4d0199d 100644
  done:\r
        pfn_destroy_cb = p_cep->pfn_destroy_cb;\r
        cep_context = p_cep->context;\r
-@@ -3938,12 +3919,8 @@ __cleanup_cep(
+@@ -3938,12 +3912,8 @@ __cleanup_cep(
        CL_ASSERT( KeGetCurrentIrql() == DISPATCH_LEVEL );\r
  \r
        /* If we've already come through here, we're done. */\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 014323e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,53 +0,0 @@
-Bottom: ca319bddfbb13954cab2a3e2352a3275d27cb03d
-Top:    7205d797ebb8c1b0cea4413bf8a01b6a1cdc04f2
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2009-12-17 13:59:50 -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 4d0199d..1c9671f 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -2213,21 +2213,19 @@ __cep_mad_send_cb(
- \r
-       p_cep = (kcep_t*)p_mad->context1;\r
- \r
--      /*\r
--       * 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
-       {\r
-               ib_put_mad( p_mad );\r
-               AL_EXIT( AL_DBG_CM );\r
-               return;\r
-       }\r
- \r
-+      Cl_ASSERT( p_mad->status != IB_WCS_SUCCESS );\r
-       p_mad->context1 = NULL;\r
- \r
-       KeAcquireInStackQueuedSpinLockAtDpcLevel( &gp_cep_mgr->lock, &hdl );\r
--      if( p_cep->p_send_mad != p_mad || p_mad->status == IB_WCS_SUCCESS)\r
-+      if( p_cep->p_send_mad != p_mad )\r
-       {\r
-               KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
-               ib_put_mad( p_mad );\r
-@@ -2235,12 +2233,7 @@ __cep_mad_send_cb(
-       }\r
- \r
-       /* Clear the sent MAD pointer so that we don't try cancelling again. */\r
--      if( p_cep->p_send_mad == p_mad )\r
--              p_cep->p_send_mad = NULL;\r
--\r
--      /* Treat as a timeout so we don't stall the state machine. */\r
--      if( p_mad->status == IB_WCS_CANCELED)\r
--              p_mad->status = IB_WCS_TIMEOUT_RETRY_ERR;\r
-+      p_cep->p_send_mad = NULL;\r
- \r
-       switch( p_cep->state )\r
-       {