From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 19 Jan 2010 22:33:08 +0000 (-0800)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4fed5a27e22d890a57df242eb1e52aade213771d;p=~shefty%2Frdma-win.git

refresh
---

diff --git a/meta b/meta
index e4a80b66..98a6255e 100644
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: ee0c59fd2ccd2600fcea7e89f17f84637db604d9
-Head: c701c91f0fe5e6aaabd0c5d40442809e23a5436c
+Previous: 7ce8f9c42c23384f2625194458045b118225411b
+Head: 7847fffd77783d65befa406a3aacd6c40b044dd9
 Applied:
   umad: 1b42feb2bce7b4c464bfaf5be6d660b08b198b7c
   wv-pkey: d899e432b0f76a2ba09296ef0c62e034f93af0df
   iface: c19d64c59b601512d24c7e8f46635921bd1a7714
   wv-dreq: 0ff040dd380a810adecae742d6f4f919c761a031
   rm-build: c6f066675d61b6b6ad5b6271e8af655439f70dc6
-  vend_mad: 455c934f2d19ef0a2f5b502b2b0dd034a66d677f
-  refresh-temp: c701c91f0fe5e6aaabd0c5d40442809e23a5436c
+  vend_mad: 7847fffd77783d65befa406a3aacd6c40b044dd9
 Unapplied:
   test-wv-print: e22c09acef52e5c119f80c0a646bcf9035094b80
   test-pkey0: 812ba9c5ccb0e841f37bdc52713151bd4175613e
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index a346a178..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,61 +0,0 @@
-Bottom: b81a31a6ff1ef46c274a620670f7bd8425490a79
-Top:    3df8f1753c07c2a129bb1f6ba64b2c8edffff8fd
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-01-19 14:33:03 -0800
-
-Refresh of vend_mad
-
----
-
-diff --git a/trunk/core/al/kernel/al_smi.c b/trunk/core/al/kernel/al_smi.c
-index 7f5abee..eab1fb0 100644
---- a/trunk/core/al/kernel/al_smi.c
-+++ b/trunk/core/al/kernel/al_smi.c
-@@ -1191,20 +1191,12 @@ route_mad_send(
- 
- 		case IB_MCLASS_PERF:
- 		case IB_MCLASS_BM:
--			local = ( h_av &&
-+		case IB_MLX_VENDOR_CLASS1:
-+		case IB_MLX_VENDOR_CLASS2:
-+			local = !(p_mad->method & IB_MAD_METHOD_RESP_MASK) && ( h_av &&
- 				( h_av->av_attr.dlid ==
- 				( h_av->av_attr.path_bits | p_spl_qp_svc->base_lid ) ) );
- 			break;
--
--		default:
--			/* Route vendor specific MADs to the HCA provider. */
--			if( ib_class_is_vendor_specific( p_mad->mgmt_class ) )
--			{
--				local = ( h_av &&
--					( h_av->av_attr.dlid ==
--					( h_av->av_attr.path_bits | p_spl_qp_svc->base_lid ) ) );
--			}
--			break;
- 		}
- 	}
- 
-@@ -2959,7 +2951,7 @@ process_mad_recv(
- 
- 		case IB_MLX_VENDOR_CLASS1:
- 		case IB_MLX_VENDOR_CLASS2:
--			route = ROUTE_LOCAL;
-+			route = route_recv_vendor( p_mad_element );
- 			break;
- 
- 		default:
-@@ -3119,6 +3111,14 @@ route_recv_perf(
- 	return ROUTE_DISPATCHER;
- }
- 
-+static mad_route_t
-+route_recv_vendor(
-+	IN				ib_mad_element_t*			p_mad_element )
-+{
-+	return ( p_mad_element->p_mad_buf->method & IB_MAD_METHOD_RESP_MASK ) ?
-+		ROUTE_DISPATCHER : ROUTE_LOCAL;
-+}
-+
- /*
-  * Forward a locally generated Subnet Management trap.
-  */
diff --git a/patches/vend_mad b/patches/vend_mad
index 6b117363..b6c3bf7e 100644
--- a/patches/vend_mad
+++ b/patches/vend_mad
@@ -1,5 +1,5 @@
 Bottom: b81a31a6ff1ef46c274a620670f7bd8425490a79
-Top:    b81a31a6ff1ef46c274a620670f7bd8425490a79
+Top:    3df8f1753c07c2a129bb1f6ba64b2c8edffff8fd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-01-19 14:27:19 -0800
 
@@ -24,4 +24,55 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/core/al/kernel/al_smi.c b/trunk/core/al/kernel/al_smi.c
+index 7f5abee..eab1fb0 100644
+--- a/trunk/core/al/kernel/al_smi.c
++++ b/trunk/core/al/kernel/al_smi.c
+@@ -1191,20 +1191,12 @@ route_mad_send(
+ 
+ 		case IB_MCLASS_PERF:
+ 		case IB_MCLASS_BM:
+-			local = ( h_av &&
++		case IB_MLX_VENDOR_CLASS1:
++		case IB_MLX_VENDOR_CLASS2:
++			local = !(p_mad->method & IB_MAD_METHOD_RESP_MASK) && ( h_av &&
+ 				( h_av->av_attr.dlid ==
+ 				( h_av->av_attr.path_bits | p_spl_qp_svc->base_lid ) ) );
+ 			break;
+-
+-		default:
+-			/* Route vendor specific MADs to the HCA provider. */
+-			if( ib_class_is_vendor_specific( p_mad->mgmt_class ) )
+-			{
+-				local = ( h_av &&
+-					( h_av->av_attr.dlid ==
+-					( h_av->av_attr.path_bits | p_spl_qp_svc->base_lid ) ) );
+-			}
+-			break;
+ 		}
+ 	}
+ 
+@@ -2959,7 +2951,7 @@ process_mad_recv(
+ 
+ 		case IB_MLX_VENDOR_CLASS1:
+ 		case IB_MLX_VENDOR_CLASS2:
+-			route = ROUTE_LOCAL;
++			route = route_recv_vendor( p_mad_element );
+ 			break;
+ 
+ 		default:
+@@ -3119,6 +3111,14 @@ route_recv_perf(
+ 	return ROUTE_DISPATCHER;
+ }
+ 
++static mad_route_t
++route_recv_vendor(
++	IN				ib_mad_element_t*			p_mad_element )
++{
++	return ( p_mad_element->p_mad_buf->method & IB_MAD_METHOD_RESP_MASK ) ?
++		ROUTE_DISPATCHER : ROUTE_LOCAL;
++}
++
+ /*
+  * Forward a locally generated Subnet Management trap.
+  */