X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/51763ff18e096fee6c7a0bba26ac4ca8a2ebd6c9..040ee7aa28536ce42b197994fa22b2e023943327:/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 3cf4f5ece..4b35b1f25 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -614,7 +614,8 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
 	if (!ag71xx_desc_empty(desc))
 		goto err_drop;
 
-	ag71xx_add_ar8216_header(ag, skb);
+	if (ag71xx_has_ar8216(ag))
+		ag71xx_add_ar8216_header(ag, skb);
 
 	if (skb->len <= 0) {
 		DBG("%s: packet len is too small\n", ag->dev->name);
@@ -758,6 +759,25 @@ 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);
+	skb_put(copy_skb, 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;
@@ -772,7 +792,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 		struct ag71xx_desc *desc = ring->buf[i].desc;
 		struct sk_buff *skb;
 		int pktlen;
-		int err;
+		int err = 0;
 
 		if (ag71xx_desc_empty(desc))
 			break;
@@ -795,13 +815,15 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 		dev->stats.rx_packets++;
 		dev->stats.rx_bytes += pktlen;
 
-		err = ag71xx_remove_ar8216_header(ag, skb);
+		if (ag71xx_has_ar8216(ag))
+			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);