[kernel] refresh 2.6.30 patches

[openwrt.git] / 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 8921639..e5eced2 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx built-in ethernet mac driver
  *
- *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver
@@ -473,6 +473,8 @@ static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (!ag71xx_desc_empty(desc))
                goto err_drop;
 
+       ag71xx_add_ar8216_header(ag, skb);
+
        if (skb->len <= 0) {
                DBG("%s: packet len is too small\n", ag->dev->name);
                goto err_drop;
@@ -647,15 +649,20 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                skb_put(skb, pktlen);
 
                skb->dev = dev;
-               skb->protocol = eth_type_trans(skb, dev);
                skb->ip_summed = CHECKSUM_NONE;
 
-               netif_receive_skb(skb);
-
                dev->last_rx = jiffies;
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += pktlen;
 
+               if (ag71xx_remove_ar8216_header(ag, skb) != 0) {
+                       dev->stats.rx_dropped++;
+                       kfree_skb(skb);
+               } else {
+                       skb->protocol = eth_type_trans(skb, dev);
+                       netif_receive_skb(skb);
+               }
+
                ring->buf[i].skb = NULL;
                done++;
 
@@ -716,13 +723,13 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                spin_lock_irqsave(&ag->lock, flags);
                ag71xx_int_enable(ag, AG71XX_INT_POLL);
                spin_unlock_irqrestore(&ag->lock, flags);
-               return 0;
+               return done;
        }
 
  more:
        DBG("%s: stay in polling mode, done=%d, limit=%d\n",
                        dev->name, done, limit);
-       return 1;
+       return done;
 
  oom:
        if (netif_msg_rx_err(ag))
@@ -797,7 +804,7 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        ag = netdev_priv(dev);
        ag->pdev = pdev;
        ag->dev = dev;
-       ag->mii_bus = &ag71xx_mdio_bus->mii_bus;
+       ag->mii_bus = ag71xx_mdio_bus->mii_bus;
        ag->msg_enable = netif_msg_init(ag71xx_debug,
                                        AG71XX_DEFAULT_MSG_ENABLE);
        spin_lock_init(&ag->lock);