From: Gabor Juhos <juhosg@openwrt.org>
Date: Sat, 27 Mar 2010 13:05:27 +0000 (+0000)
Subject: ar71xx: ag71xx: copy received packet to avoid unaligned access in the IP stack
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b7ca043240a27dac279949409d20fd0f35667577;p=openwrt%2Fstaging%2Fnbd.git

ar71xx: ag71xx: copy received packet to avoid unaligned access in the IP stack

SVN-Revision: 20506
---

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 f4c5a12147..989ed0e8a5 100644
--- 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,23 @@ 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;
+
+	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);
+	dev_kfree_skb_any(*pskb);
+	*pskb = copy_skb;
+
+	return 0;
+}
+
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 {
 	struct net_device *dev = ag->dev;
@@ -798,6 +815,8 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 
 		if (ag71xx_has_ar8216(ag))
 			err = ag71xx_remove_ar8216_header(ag, skb);
+		else
+			err = ag71xx_rx_copy_skb(ag, &skb, pktlen);
 
 		if (err) {
 			dev->stats.rx_dropped++;