summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-04-03 13:59:08 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-04-03 13:59:08 +0000
commitc874513cfad123d5577f38cb6f316a77e13aa7d7 (patch)
tree6ff948209f3e759a4ab547b1478d2510379343a6 /target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
parent10c00a63684c778d05306f5d3c8ea1a262a6ced2 (diff)
downloadmaster-31e0f0ae-c874513cfad123d5577f38cb6f316a77e13aa7d7.tar.gz
master-31e0f0ae-c874513cfad123d5577f38cb6f316a77e13aa7d7.tar.bz2
master-31e0f0ae-c874513cfad123d5577f38cb6f316a77e13aa7d7.zip
ar71xx: fix broken LAN ports on the boards with AR8216 switch (closes #7024)
* cc: backfire@openwrt.org SVN-Revision: 20673
Diffstat (limited to 'target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c6
1 files changed, 3 insertions, 3 deletions
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 989ed0e8a5..4b35b1f251 100644
--- 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);