refresh

diff --git a/meta b/meta
index 01d7699a7fab5f0d9db13b56e3f4d0a30b72e24e..ea1c2eebf20e0be6611d1389879ab8228d25714a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: a2a4cea2a95a5ccb328b0b2708efeb2f4a4f5a31
-Head: b344a43b1e1d8850c1025dbe79558016a6a7305d
+Previous: 81016c6223c92be86777b01227a834c6e998f2ba
+Head: 3a99effd09f68fbe601233c0ac58c588303b93d4
 Applied:
   add-madeye: fe9bb0ff05518e148113bff7de37134a77b1a6ad
-  madeye-fix1: f21120ab8a36d5ed2b74d89d38797ca98f8f3f1a
-  refresh-temp: b344a43b1e1d8850c1025dbe79558016a6a7305d
+  madeye-fix1: 3a99effd09f68fbe601233c0ac58c588303b93d4
 Unapplied:
 Hidden:

diff --git a/patches/madeye-fix1 b/patches/madeye-fix1
index cadccdecaed29ad6bb037063360731699ec0391f..f37d766b594c2fc7c6339873a7e51b7f751a354d 100644 (file)
--- a/patches/madeye-fix1
+++ b/patches/madeye-fix1
@@ -1,5 +1,5 @@
 Bottom: 941b4e8b3932e1ee25cac96f1b02f8431b784c2a
-Top:    941b4e8b3932e1ee25cac96f1b02f8431b784c2a
+Top:    0aad4fd43f27fd8fc9b4b828e021c0ebb5c873e1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-06-30 16:50:05 -0700
 
@@ -11,4 +11,43 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/drivers/infiniband/util/madeye/madeye.c b/drivers/infiniband/util/madeye/madeye.c
+index a0c86b9..1b4bb64 100644
+--- a/drivers/infiniband/util/madeye/madeye.c
++++ b/drivers/infiniband/util/madeye/madeye.c
+@@ -443,7 +443,7 @@ static void snoop_smi_handler(struct ib_mad_agent *mad_agent,
+ 
+       if (!smp && hdr->mgmt_class != mgmt_class)
+               return;
+-      if (attr_id && hdr->attr_id != attr_id)
++      if (attr_id && be16_to_cpu(hdr->attr_id) != attr_id)
+               return;
+ 
+       printk("Madeye:sent SMP\n");
+@@ -455,7 +455,7 @@ static void recv_smi_handler(struct ib_mad_agent *mad_agent,
+ {
+       if (!smp && mad_recv_wc->recv_buf.mad->mad_hdr.mgmt_class != mgmt_class)
+               return;
+-      if (attr_id && mad_recv_wc->recv_buf.mad->mad_hdr.attr_id != attr_id)
++      if (attr_id && be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id) != attr_id)
+               return;
+ 
+       printk("Madeye:recv SMP\n");
+@@ -510,7 +510,7 @@ static void snoop_gsi_handler(struct ib_mad_agent *mad_agent,
+ 
+       if (!gmp && hdr->mgmt_class != mgmt_class)
+               return;
+-      if (attr_id && hdr->attr_id != attr_id)
++      if (attr_id && be16_to_cpu(hdr->attr_id) != attr_id)
+               return;
+ 
+       printk("Madeye:sent GMP\n");
+@@ -524,7 +524,7 @@ static void recv_gsi_handler(struct ib_mad_agent *mad_agent,
+ 
+       if (!gmp && hdr->mgmt_class != mgmt_class)
+               return;
+-      if (attr_id && hdr->attr_id != attr_id)
++      if (attr_id && be16_to_cpu(hdr->attr_id) != attr_id)
+               return;
+ 
+       printk("Madeye:recv GMP\n");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d565232..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,49 +0,0 @@
-Bottom: 941b4e8b3932e1ee25cac96f1b02f8431b784c2a
-Top:    0aad4fd43f27fd8fc9b4b828e021c0ebb5c873e1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-06-30 16:52:44 -0700
-
-Refresh of madeye-fix1
-
----
-
-diff --git a/drivers/infiniband/util/madeye/madeye.c b/drivers/infiniband/util/madeye/madeye.c
-index a0c86b9..1b4bb64 100644
---- a/drivers/infiniband/util/madeye/madeye.c
-+++ b/drivers/infiniband/util/madeye/madeye.c
-@@ -443,7 +443,7 @@ static void snoop_smi_handler(struct ib_mad_agent *mad_agent,
- 
-       if (!smp && hdr->mgmt_class != mgmt_class)
-               return;
--      if (attr_id && hdr->attr_id != attr_id)
-+      if (attr_id && be16_to_cpu(hdr->attr_id) != attr_id)
-               return;
- 
-       printk("Madeye:sent SMP\n");
-@@ -455,7 +455,7 @@ static void recv_smi_handler(struct ib_mad_agent *mad_agent,
- {
-       if (!smp && mad_recv_wc->recv_buf.mad->mad_hdr.mgmt_class != mgmt_class)
-               return;
--      if (attr_id && mad_recv_wc->recv_buf.mad->mad_hdr.attr_id != attr_id)
-+      if (attr_id && be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id) != attr_id)
-               return;
- 
-       printk("Madeye:recv SMP\n");
-@@ -510,7 +510,7 @@ static void snoop_gsi_handler(struct ib_mad_agent *mad_agent,
- 
-       if (!gmp && hdr->mgmt_class != mgmt_class)
-               return;
--      if (attr_id && hdr->attr_id != attr_id)
-+      if (attr_id && be16_to_cpu(hdr->attr_id) != attr_id)
-               return;
- 
-       printk("Madeye:sent GMP\n");
-@@ -524,7 +524,7 @@ static void recv_gsi_handler(struct ib_mad_agent *mad_agent,
- 
-       if (!gmp && hdr->mgmt_class != mgmt_class)
-               return;
--      if (attr_id && hdr->attr_id != attr_id)
-+      if (attr_id && be16_to_cpu(hdr->attr_id) != attr_id)
-               return;
- 
-       printk("Madeye:recv GMP\n");