1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 01f7e811739b..692ee248e486 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -89,10 +89,10 @@ static struct platform_device_id fec_devtype[] = {
                 .driver_data = 0,
         }, {
                 .name = "imx25-fec",
-                .driver_data = FEC_QUIRK_USE_GASKET | FEC_QUIRK_HAS_RACC,
+                .driver_data = FEC_QUIRK_USE_GASKET,
         }, {
                 .name = "imx27-fec",
-                .driver_data = FEC_QUIRK_HAS_RACC,
+                .driver_data = 0,
         }, {
                 .name = "imx28-fec",
                 .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME |
@@ -180,6 +180,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
 /* FEC receive acceleration */
 #define FEC_RACC_IPDIS          (1 << 1)
 #define FEC_RACC_PRODIS         (1 << 2)
+#define FEC_RACC_SHIFT16        BIT(7)
 #define FEC_RACC_OPTIONS        (FEC_RACC_IPDIS | FEC_RACC_PRODIS)
 
 /*
@@ -945,9 +946,11 @@ fec_restart(struct net_device *ndev)
 
 #if !defined(CONFIG_M5272)
         if (fep->quirks & FEC_QUIRK_HAS_RACC) {
-                /* set RX checksum */
                 val = readl(fep->hwp + FEC_RACC);
+                /* align IP header */
+                val |= FEC_RACC_SHIFT16;
                 if (fep->csum_flags & FLAG_RX_CSUM_ENABLED)
+                        /* set RX checksum */
                         val |= FEC_RACC_OPTIONS;
                 else
                         val &= ~FEC_RACC_OPTIONS;
@@ -1428,6 +1431,12 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id)
                 prefetch(skb->data - NET_IP_ALIGN);
                 skb_put(skb, pkt_len - 4);
                 data = skb->data;
+
+#if !defined(CONFIG_M5272)
+                if (fep->quirks & FEC_QUIRK_HAS_RACC)
+                        data = skb_pull_inline(skb, 2);
+#endif
+
                 if (!is_copybreak && need_swap)
                         swap_buffer(data, pkt_len);