Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

3 files changed, 15 insertions, 5 deletions

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 153d33210e89..c8950da60e6b 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -57,7 +57,6 @@
 #include <linux/types.h>
 #include <linux/inet_lro.h>
 #include <linux/slab.h>
-#include <asm/system.h>
 
 static char mv643xx_eth_driver_name[] = "mv643xx_eth";
 static char mv643xx_eth_driver_version[] = "1.4";
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 44bad608eed7..1db023b075a1 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -43,7 +43,6 @@
 #include <linux/interrupt.h>
 #include <linux/types.h>
 #include <asm/pgtable.h>
-#include <asm/system.h>
 #include <asm/cacheflush.h>
 #include <linux/pxa168_eth.h>
 
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 20a59322c79d..7732474263da 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -1767,13 +1767,14 @@ static int sky2_open(struct net_device *dev)
 
         sky2_hw_up(sky2);
 
+        /* Enable interrupts from phy/mac for port */
+        imask = sky2_read32(hw, B0_IMSK);
+
         if (hw->chip_id == CHIP_ID_YUKON_OPT ||
             hw->chip_id == CHIP_ID_YUKON_PRM ||
             hw->chip_id == CHIP_ID_YUKON_OP_2)
                 imask |= Y2_IS_PHY_QLNK;        /* enable PHY Quick Link */
 
-        /* Enable interrupts from phy/mac for port */
-        imask = sky2_read32(hw, B0_IMSK);
         imask |= portirq_msk[port];
         sky2_write32(hw, B0_IMSK, imask);
         sky2_read32(hw, B0_IMSK);
@@ -2468,6 +2469,17 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
         return err;
 }
 
+static inline bool needs_copy(const struct rx_ring_info *re,
+                              unsigned length)
+{
+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+        /* Some architectures need the IP header to be aligned */
+        if (!IS_ALIGNED(re->data_addr + ETH_HLEN, sizeof(u32)))
+                return true;
+#endif
+        return length < copybreak;
+}
+
 /* For small just reuse existing skb for next receive */
 static struct sk_buff *receive_copy(struct sky2_port *sky2,
                                     const struct rx_ring_info *re,
@@ -2598,7 +2610,7 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
                 goto error;
 
 okay:
-        if (length < copybreak)
+        if (needs_copy(re, length))
                 skb = receive_copy(sky2, re, length);
         else
                 skb = receive_new(sky2, re, length);