ar71xx: ag71xx: avoid unalinged accesses when using the phy specific receive functions

[openwrt/openwrt.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_main.c

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 f4c5a12147bf0f66f531cb9ffcf7c420dfafaf99..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
@@ -759,6 +759,32 @@ static int ag71xx_tx_packets(struct ag71xx *ag)
        return sent;
 }
 
+static int ag71xx_rx_copy_skb(struct ag71xx *ag, struct sk_buff **pskb,
+                             int pktlen)
+{
+       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;
+
+       skb_reserve(copy_skb, NET_IP_ALIGN);
+       skb_copy_from_linear_data(*pskb, copy_skb->data, pktlen);
+       skb_put(copy_skb, pktlen);
+
+       dev_kfree_skb_any(*pskb);
+       *pskb = copy_skb;
+
+       return 0;
+
+ keep:
+       skb_put(*pskb, pktlen);
+       return 0;
+}
+
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 {
        struct net_device *dev = ag->dev;
@@ -797,18 +823,22 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                dev->stats.rx_bytes += pktlen;
 
                if (ag71xx_has_ar8216(ag))
-                       err = ag71xx_remove_ar8216_header(ag, skb);
+                       err = ag71xx_remove_ar8216_header(ag, skb, pktlen);
+               else
+                       err = ag71xx_rx_copy_skb(ag, &skb, pktlen);
 
                if (err) {
                        dev->stats.rx_dropped++;
                        kfree_skb(skb);
                } else {
-                       skb_put(skb, pktlen);
-
                        skb->dev = dev;
                        skb->ip_summed = CHECKSUM_NONE;
-                       skb->protocol = eth_type_trans(skb, dev);
-                       netif_receive_skb(skb);
+                       if (ag->phy_dev) {
+                               ag->phy_dev->netif_receive_skb(skb);
+                       } else {
+                               skb->protocol = eth_type_trans(skb, dev);
+                               netif_receive_skb(skb);
+                       }
                }
 
                ring->buf[i].skb = NULL;