Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

* 'next' of git://git.monstr.eu/linux-2.6-microblaze: (42 commits)
  microblaze: Fix build with make 3.82
  fbdev/xilinxfb: Microblaze driver support
  microblaze: Support C optimized lib functions for little-endian
  microblaze: Separate library optimized functions
  microblaze: Support timer on AXI lite
  microblaze: Add support for little-endian Microblaze
  microblaze: KGDB little endian support
  microblaze: Add PVR for endians plus detection
  net: emaclite: Add support for little-endian platforms
  microblaze: trivial: Add comment for AXI pvr
  microblaze: pci-common cleanup
  microblaze: Support early console on uart16550
  microblaze: Do not compile early console support for uartlite if is disabled
  microblaze: Setup early console dynamically
  microblaze: Rename all uartlite early printk functions
  microblaze: remove early printk uarlite console dependency from header
  microblaze: Remove additional compatible properties
  microblaze: Remove hardcoded asm instraction for PVR loading
  microblaze: Use static const char * const where possible
  microblaze: Define VMALLOC_START/END
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index f3f8be5a35fa..14f0955eca68 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/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;