Merge commit 'origin/master'

Manually fixed up:

	drivers/net/fs_enet/fs_enet-main.c

1 files changed, 8 insertions, 73 deletions

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 36f229ff52f..b8394cf134e 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -44,8 +44,7 @@
  *  happen immediately, but will wait until either a set number
  *  of frames or amount of time have passed).  In NAPI, the
  *  interrupt handler will signal there is work to be done, and
- *  exit.  Without NAPI, the packet(s) will be handled
- *  immediately.  Both methods will start at the last known empty
+ *  exit. This method will start at the last known empty
  *  descriptor, and process every subsequent descriptor until there
  *  are none left with data (NAPI will stop after a set number of
  *  packets to give time to other tasks, but will eventually
@@ -101,12 +100,6 @@
 #undef BRIEF_GFAR_ERRORS
 #undef VERBOSE_GFAR_ERRORS
 
-#ifdef CONFIG_GFAR_NAPI
-#define RECEIVE(x) netif_receive_skb(x)
-#else
-#define RECEIVE(x) netif_rx(x)
-#endif
-
 const char gfar_driver_name[] = "Gianfar Ethernet";
 const char gfar_driver_version[] = "1.3";
 
@@ -131,9 +124,7 @@ static void free_skb_resources(struct gfar_private *priv);
 static void gfar_set_multi(struct net_device *dev);
 static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr);
 static void gfar_configure_serdes(struct net_device *dev);
-#ifdef CONFIG_GFAR_NAPI
 static int gfar_poll(struct napi_struct *napi, int budget);
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void gfar_netpoll(struct net_device *dev);
 #endif
@@ -264,9 +255,7 @@ static int gfar_probe(struct platform_device *pdev)
         dev->hard_start_xmit = gfar_start_xmit;
         dev->tx_timeout = gfar_timeout;
         dev->watchdog_timeo = TX_TIMEOUT;
-#ifdef CONFIG_GFAR_NAPI
         netif_napi_add(dev, &priv->napi, gfar_poll, GFAR_DEV_WEIGHT);
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
         dev->poll_controller = gfar_netpoll;
 #endif
@@ -367,11 +356,7 @@ static int gfar_probe(struct platform_device *pdev)
 
         /* Even more device info helps when determining which kernel */
         /* provided which set of benchmarks. */
-#ifdef CONFIG_GFAR_NAPI
         printk(KERN_INFO "%s: Running with NAPI enabled\n", dev->name);
-#else
-        printk(KERN_INFO "%s: Running with NAPI disabled\n", dev->name);
-#endif
         printk(KERN_INFO "%s: %d/%d RX/TX BD ring size\n",
                dev->name, priv->rx_ring_size, priv->tx_ring_size);
 
@@ -1039,7 +1024,7 @@ rx_irq_fail:
 tx_irq_fail:
         free_irq(priv->interruptError, dev);
 err_irq_fail:
-err_rxalloc_fail:       
+err_rxalloc_fail:
 rx_skb_fail:
         free_skb_resources(priv);
 tx_skb_fail:
@@ -1056,14 +1041,10 @@ tx_skb_fail:
 /* Returns 0 for success. */
 static int gfar_enet_open(struct net_device *dev)
 {
-#ifdef CONFIG_GFAR_NAPI
         struct gfar_private *priv = netdev_priv(dev);
-#endif
         int err;
 
-#ifdef CONFIG_GFAR_NAPI
         napi_enable(&priv->napi);
-#endif
 
         /* Initialize a bunch of registers */
         init_registers(dev);
@@ -1073,17 +1054,13 @@ static int gfar_enet_open(struct net_device *dev)
         err = init_phy(dev);
 
         if(err) {
-#ifdef CONFIG_GFAR_NAPI
                 napi_disable(&priv->napi);
-#endif
                 return err;
         }
 
         err = startup_gfar(dev);
         if (err) {
-#ifdef CONFIG_GFAR_NAPI
                 napi_disable(&priv->napi);
-#endif
                 return err;
         }
 
@@ -1239,9 +1216,7 @@ static int gfar_close(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
 
-#ifdef CONFIG_GFAR_NAPI
         napi_disable(&priv->napi);
-#endif
 
         stop_gfar(dev);
 
@@ -1370,7 +1345,7 @@ static void gfar_timeout(struct net_device *dev)
                 startup_gfar(dev);
         }
 
-        netif_schedule(dev);
+        netif_tx_schedule_all(dev);
 }
 
 /* Interrupt Handler for Transmit complete */
@@ -1538,14 +1513,9 @@ irqreturn_t gfar_receive(int irq, void *dev_id)
 {
         struct net_device *dev = (struct net_device *) dev_id;
         struct gfar_private *priv = netdev_priv(dev);
-#ifdef CONFIG_GFAR_NAPI
         u32 tempval;
-#else
-        unsigned long flags;
-#endif
 
         /* support NAPI */
-#ifdef CONFIG_GFAR_NAPI
         /* Clear IEVENT, so interrupts aren't called again
          * because of the packets that have already arrived */
         gfar_write(&priv->regs->ievent, IEVENT_RTX_MASK);
@@ -1562,38 +1532,10 @@ irqreturn_t gfar_receive(int irq, void *dev_id)
                                 dev->name, gfar_read(&priv->regs->ievent),
                                 gfar_read(&priv->regs->imask));
         }
-#else
-        /* Clear IEVENT, so rx interrupt isn't called again
-         * because of this interrupt */
-        gfar_write(&priv->regs->ievent, IEVENT_RX_MASK);
-
-        spin_lock_irqsave(&priv->rxlock, flags);
-        gfar_clean_rx_ring(dev, priv->rx_ring_size);
-
-        /* If we are coalescing interrupts, update the timer */
-        /* Otherwise, clear it */
-        if (likely(priv->rxcoalescing)) {
-                gfar_write(&priv->regs->rxic, 0);
-                gfar_write(&priv->regs->rxic,
-                           mk_ic_value(priv->rxcount, priv->rxtime));
-        }
-
-        spin_unlock_irqrestore(&priv->rxlock, flags);
-#endif
 
         return IRQ_HANDLED;
 }
 
-static inline int gfar_rx_vlan(struct sk_buff *skb,
-                struct vlan_group *vlgrp, unsigned short vlctl)
-{
-#ifdef CONFIG_GFAR_NAPI
-        return vlan_hwaccel_receive_skb(skb, vlgrp, vlctl);
-#else
-        return vlan_hwaccel_rx(skb, vlgrp, vlctl);
-#endif
-}
-
 static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb)
 {
         /* If valid headers were found, and valid sums
@@ -1650,10 +1592,11 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
                 skb->protocol = eth_type_trans(skb, dev);
 
                 /* Send the packet up the stack */
-                if (unlikely(priv->vlgrp && (fcb->flags & RXFCB_VLN)))
-                        ret = gfar_rx_vlan(skb, priv->vlgrp, fcb->vlctl);
-                else
-                        ret = RECEIVE(skb);
+                if (unlikely(priv->vlgrp && (fcb->flags & RXFCB_VLN))) {
+                        ret = vlan_hwaccel_receive_skb(skb, priv->vlgrp,
+                                                       fcb->vlctl);
+                } else
+                        ret = netif_receive_skb(skb);
 
                 if (NET_RX_DROP == ret)
                         priv->extra_stats.kernel_dropped++;
@@ -1740,7 +1683,6 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
         return howmany;
 }
 
-#ifdef CONFIG_GFAR_NAPI
 static int gfar_poll(struct napi_struct *napi, int budget)
 {
         struct gfar_private *priv = container_of(napi, struct gfar_private, napi);
@@ -1775,7 +1717,6 @@ static int gfar_poll(struct napi_struct *napi, int budget)
 
         return howmany;
 }
-#endif
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 /*
@@ -1895,7 +1836,6 @@ static void adjust_link(struct net_device *dev)
                 if (!priv->oldlink) {
                         new_state = 1;
                         priv->oldlink = 1;
-                        netif_schedule(dev);
                 }
         } else if (priv->oldlink) {
                 new_state = 1;
@@ -2119,11 +2059,6 @@ static irqreturn_t gfar_error(int irq, void *dev_id)
 
                 gfar_receive(irq, dev_id);
 
-#ifndef CONFIG_GFAR_NAPI
-                /* Clear the halt bit in RSTAT */
-                gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT);
-#endif
-
                 if (netif_msg_rx_err(priv))
                         printk(KERN_DEBUG "%s: busy error (rstat: %x)\n",
                                dev->name, gfar_read(&priv->regs->rstat));