backfire: ar71xx: ag71xx: avoid unalinged accesses when using the phy specific receiv...

SVN-Revision: 20760

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index 77551dd6255f32e8eae7894f0bbdcc277b345517..af41972481c97f99bf712b9ae628f16baccf16ab 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -38,7 +38,7 @@
 #define ETH_FCS_LEN    4
 
 #define AG71XX_DRV_NAME                "ag71xx"
-#define AG71XX_DRV_VERSION     "0.5.34"
+#define AG71XX_DRV_VERSION     "0.5.35"
 
 #define AG71XX_NAPI_WEIGHT     64
 #define AG71XX_OOM_REFILL      (1 + HZ/10)

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 27c19564fcedccc316e8f5630ec7c9d8c27ae5f2..8d61294beb1b99934f072ac61dd03b7eed0456c2 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -764,6 +764,9 @@ static int ag71xx_rx_copy_skb(struct ag71xx *ag, struct sk_buff **pskb,
 {
        struct sk_buff *copy_skb;
 
+       if (ag->phy_dev && (ag->phy_dev->pkt_align % 4) == 2)
+               goto keep;
+
        copy_skb = netdev_alloc_skb(ag->dev, pktlen + NET_IP_ALIGN);
        if (!copy_skb)
                return -ENOMEM;
@@ -776,6 +779,10 @@ static int ag71xx_rx_copy_skb(struct ag71xx *ag, struct sk_buff **pskb,
        *pskb = copy_skb;
 
        return 0;
+
+ keep:
+       skb_put(*pskb, pktlen);
+       return 0;
 }
 
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)