From: Gabor Juhos <juhosg@openwrt.org>
Date: Sat, 27 Mar 2010 13:05:20 +0000 (+0000)
Subject: ar71xx: ag71xx: reorganize ag71xx_rx_packet function
X-Git-Tag: reboot~20435
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=200db5ebb5d18509a29fca9280a16c4e72649b25;p=openwrt%2Fstaging%2Fblogic.git

ar71xx: ag71xx: reorganize ag71xx_rx_packet function

SVN-Revision: 20504
---

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 824423966373..3cf4f5eced79 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -772,6 +772,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;
 
 		if (ag71xx_desc_empty(desc))
 			break;
@@ -790,19 +791,19 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 		dma_unmap_single(&dev->dev, ring->buf[i].dma_addr,
 				 AG71XX_RX_PKT_SIZE, DMA_FROM_DEVICE);
 
-		skb_put(skb, pktlen);
-
-		skb->dev = dev;
-		skb->ip_summed = CHECKSUM_NONE;
-
 		dev->last_rx = jiffies;
 		dev->stats.rx_packets++;
 		dev->stats.rx_bytes += pktlen;
 
-		if (ag71xx_remove_ar8216_header(ag, skb) != 0) {
+		err = ag71xx_remove_ar8216_header(ag, skb);
+		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);
 			netif_receive_skb(skb);
 		}