From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 16 Mar 2012 13:46:51 +0000 (+0100)
Subject: [myri10ge] Fix compilation error in myri10ge_command() with gcc 4.7
X-Git-Tag: v1.20.1~1942
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e81ff22974a3cecc1ffa86973fb59f1e9f90af2;p=thirdparty%2Fipxe.git

[myri10ge] Fix compilation error in myri10ge_command() with gcc 4.7

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/drivers/net/myri10ge.c b/src/drivers/net/myri10ge.c
index 5bb555d82..2c9bf960a 100644
--- a/src/drivers/net/myri10ge.c
+++ b/src/drivers/net/myri10ge.c
@@ -304,10 +304,10 @@ static int myri10ge_command ( struct myri10ge_private *priv,
 	command->response_addr.high = 0;
 	command->response_addr.low
 		= htonl ( virt_to_bus ( &priv->dma->command_response ) );
-	for ( i=0; i<36; i+=4 )
-		* ( uint32 * ) &command->pad[i] = 0;
+	for ( i=0; i<9; i++ )
+		command->pad[i] = 0;
 	wmb();
-	* ( uint32 * ) &command->pad[36] = 0;
+	command->pad[9] = 0;
 
 	/* Wait up to 2 seconds for a response. */
 
diff --git a/src/drivers/net/myri10ge_mcp.h b/src/drivers/net/myri10ge_mcp.h
index 397f8b0dd..391dab379 100644
--- a/src/drivers/net/myri10ge_mcp.h
+++ b/src/drivers/net/myri10ge_mcp.h
@@ -80,7 +80,7 @@ struct mcp_cmd {
   /* 16 */
   struct mcp_dma_addr response_addr;
   /* 24 */
-  uint8_t pad[40];
+  uint32_t pad[10];
 };
 typedef struct mcp_cmd mcp_cmd_t;