[PATCH 2.6.19 4/4] ehca: ehca_av.c use constant for max mtu

[PATCH 2.6.19 4/4] ehca: ehca_av.c use constant for max mtu

[Hoang-Nam Nguyen]

[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]

Hello Roland!
This is a patch for ehca, mainly a code change to adhere to
kernel coding style. It defines and uses a constant EHCA_MAX_MTU 
instead hardcoded value.
Thanks!
Nam


Signed-off-by: Hoang-Nam Nguyen <hnguyen@de.ibm.com>
---


 ehca_av.c |    5 ++---
 hipz_hw.h |    2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c
index 3bac197..214e2fd 100644
--- a/drivers/infiniband/hw/ehca/ehca_av.c
+++ b/drivers/infiniband/hw/ehca/ehca_av.c
@@ -118,8 +118,7 @@ struct ib_ah *ehca_create_ah(struct ib_p
   }
   memcpy(&av->av.grh.word_1, &gid, sizeof(gid));
  }
- /* for the time being we use a hard coded PMTU of 2048 Bytes */
- av->av.pmtu = 4;
+ av->av.pmtu = EHCA_MAX_MTU;
 
  /* dgid comes in grh.word_3 */
  memcpy(&av->av.grh.word_3, &ah_attr->grh.dgid,
@@ -193,7 +192,7 @@ int ehca_modify_ah(struct ib_ah *ah, str
   memcpy(&new_ehca_av.grh.word_1, &gid, sizeof(gid));
  }
 
- new_ehca_av.pmtu = 4; /* see also comment in create_ah() */
+ new_ehca_av.pmtu = EHCA_MAX_MTU;
 
  memcpy(&new_ehca_av.grh.word_3, &ah_attr->grh.dgid,
         sizeof(ah_attr->grh.dgid));
diff --git a/drivers/infiniband/hw/ehca/hipz_hw.h b/drivers/infiniband/hw/ehca/hipz_hw.h
index 3fc92b0..fad9136 100644
--- a/drivers/infiniband/hw/ehca/hipz_hw.h
+++ b/drivers/infiniband/hw/ehca/hipz_hw.h
@@ -45,6 +45,8 @@ #define __HIPZ_HW_H__
 
 #include "ehca_tools.h"
 
+#define EHCA_MAX_MTU 4
+
 /* QP Table Entry Memory Map */
 struct hipz_qptemm {
  u64 qpx_hcr;

[-- Attachment #2: roland_svnehca_0018_maxmtu.patch --]
[-- Type: text/x-diff, Size: 1206 bytes --]

diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c
index 3bac197..214e2fd 100644
--- a/drivers/infiniband/hw/ehca/ehca_av.c
+++ b/drivers/infiniband/hw/ehca/ehca_av.c
@@ -118,8 +118,7 @@ struct ib_ah *ehca_create_ah(struct ib_p
 		}
 		memcpy(&av->av.grh.word_1, &gid, sizeof(gid));
 	}
-	/* for the time being we use a hard coded PMTU of 2048 Bytes */
-	av->av.pmtu = 4;
+	av->av.pmtu = EHCA_MAX_MTU;
 
 	/* dgid comes in grh.word_3 */
 	memcpy(&av->av.grh.word_3, &ah_attr->grh.dgid,
@@ -193,7 +192,7 @@ int ehca_modify_ah(struct ib_ah *ah, str
 		memcpy(&new_ehca_av.grh.word_1, &gid, sizeof(gid));
 	}
 
-	new_ehca_av.pmtu = 4; /* see also comment in create_ah() */
+	new_ehca_av.pmtu = EHCA_MAX_MTU;
 
 	memcpy(&new_ehca_av.grh.word_3, &ah_attr->grh.dgid,
 	       sizeof(ah_attr->grh.dgid));
diff --git a/drivers/infiniband/hw/ehca/hipz_hw.h b/drivers/infiniband/hw/ehca/hipz_hw.h
index 3fc92b0..fad9136 100644
--- a/drivers/infiniband/hw/ehca/hipz_hw.h
+++ b/drivers/infiniband/hw/ehca/hipz_hw.h
@@ -45,6 +45,8 @@ #define __HIPZ_HW_H__
 
 #include "ehca_tools.h"
 
+#define EHCA_MAX_MTU 4
+
 /* QP Table Entry Memory Map */
 struct hipz_qptemm {
 	u64 qpx_hcr;

Re: [PATCH 2.6.19 4/4] ehca: ehca_av.c use constant for max mtu

[Benjamin Herrenschmidt]

Can you fix your patch sending technique ? A mangled patch inline with a
non-mangled one in attachment... that's a bit gross. Just get a proper
one inline and be done with it. If your mailer can't be coerced into not
damaging patches, then use another one for sending them.

Cheers,
Ben

Re: [PATCH 2.6.19 4/4] ehca: ehca_av.c use constant for max mtu

[Roland Dreier]

Thanks, I've applied 1 through 4.