From ac38fa36ed40f2c04b27206eae1ed80e58a28f55 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Fri, 10 Sep 2010 13:22:35 +0200
Subject: [PATCH] --- yaml --- r: 217151 b: refs/heads/master c:
 44180a573ec936cd989a7c0478f5fd1cf8e1ebc3 h: refs/heads/master i:   217149:
 623cc982ee422841b2c2f2f22b55b2fe1f8e0c96   217147:
 74f26178613826a0566152012969e2934110b5c8   217143:
 69453206e4563183f757f403f2bd2d0a1dcf437b   217135:
 70085b373a08454515a704cad9ee1264d77d693b   217119:
 da2c86d3b4b34388dc608a9aa1c0b2faba8f2d1c   217087:
 3db2d0f183aa5c1026c1c4fab28098498e7e4d79 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/xilinx_emaclite.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 166d94ac21a5..91c9f219229c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4dcaee50a3859bc3c7e6bace5daeec1d903e239
+refs/heads/master: 44180a573ec936cd989a7c0478f5fd1cf8e1ebc3
diff --git a/trunk/drivers/net/xilinx_emaclite.c b/trunk/drivers/net/xilinx_emaclite.c
index ecbbb688eba0..4da1d90c2895 100644
--- a/trunk/drivers/net/xilinx_emaclite.c
+++ b/trunk/drivers/net/xilinx_emaclite.c
@@ -430,8 +430,8 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data)
 	}
 
 	/* Get the protocol type of the ethernet frame that arrived */
-	proto_type = ((in_be32(addr + XEL_HEADER_OFFSET +
-			XEL_RXBUFF_OFFSET) >> XEL_HEADER_SHIFT) &
+	proto_type = ((ntohl(in_be32(addr + XEL_HEADER_OFFSET +
+			XEL_RXBUFF_OFFSET)) >> XEL_HEADER_SHIFT) &
 			XEL_RPLR_LENGTH_MASK);
 
 	/* Check if received ethernet frame is a raw ethernet frame
@@ -439,9 +439,9 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data)
 	if (proto_type > (ETH_FRAME_LEN + ETH_FCS_LEN)) {
 
 		if (proto_type == ETH_P_IP) {
-			length = ((in_be32(addr +
+			length = ((ntohl(in_be32(addr +
 					XEL_HEADER_IP_LENGTH_OFFSET +
-					XEL_RXBUFF_OFFSET) >>
+					XEL_RXBUFF_OFFSET)) >>
 					XEL_HEADER_SHIFT) &
 					XEL_RPLR_LENGTH_MASK);
 			length += ETH_HLEN + ETH_FCS_LEN;