backfire: ar71xx: fix broken LAN ports on the boards with AR8216 switch (closes ...

[openwrt/svn-archive/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 989ed0e8a50b3f80bd5840e1df6b97b631e3ac0d..4b35b1f251b84660250ff35e781816858d09a0c7 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -770,6 +770,8 @@ static int ag71xx_rx_copy_skb(struct ag71xx *ag, struct sk_buff **pskb,
 
        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;
 
@@ -814,7 +816,7 @@ 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);
 
@@ -822,8 +824,6 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                        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);