From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 26 Apr 2010 16:39:13 +0000 (+0000)
Subject: ag71xx: remove rx alignment code for small packets, it seems to break ipv6 for some... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7966004d999c3ad4758ba47b9fba5297cca45bea;p=openwrt%2Fstaging%2Fblocktrron.git

ag71xx: remove rx alignment code for small packets, it seems to break ipv6 for some reason (fixes #7236)

SVN-Revision: 21166
---

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 a3b5f95989..a57b6d46fc 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -778,28 +778,6 @@ static int ag71xx_tx_packets(struct ag71xx *ag)
 	return sent;
 }
 
-static void ag71xx_rx_align_skb(struct ag71xx *ag, struct sk_buff *skb, int len)
-{
-	int offset = ((unsigned long) skb->data) % 4;
-	void *data;
-
-	if (offset == 2)
-		return;
-
-	if (ag->phy_dev && ag->phy_dev->pkt_align != 0)
-		return;
-
-	if (len > 128)
-		return;
-
-	if (WARN_ON(skb_headroom(skb) < 2))
-		return;
-
-	data = skb->data;
-	skb->data -= 2;
-	memmove(skb->data, data, len);
-}
-
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 {
 	struct net_device *dev = ag->dev;
@@ -841,8 +819,6 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 		if (ag71xx_has_ar8216(ag))
 			err = ag71xx_remove_ar8216_header(ag, skb, pktlen);
 
-		ag71xx_rx_align_skb(ag, skb, pktlen);
-
 		if (err) {
 			dev->stats.rx_dropped++;
 			kfree_skb(skb);