[NET]: Make NAPI polling independent of struct net_device objects.

Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.

In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.

The signature of the ->poll() call back goes from:

	int foo_poll(struct net_device *dev, int *budget)

to

	int foo_poll(struct napi_struct *napi, int budget)

The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract).  The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.

The napi_struct is to be embedded in the device driver private data
structures.

Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler.  Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.

With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.

Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.

[ Ported to current tree and all drivers converted.  Integrated
  Stephen's follow-on kerneldoc additions, and restored poll_list
  handling to the old style to fix mutual exclusion issues.  -DaveM ]

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 17 deletions

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index d470b19c0810..038ccfbafdd1 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -47,24 +47,13 @@
 #define PHY_ID_ANY              0x1f
 #define MII_REG_ANY             0x1f
 
-#ifdef CONFIG_SIS190_NAPI
-#define NAPI_SUFFIX     "-NAPI"
-#else
-#define NAPI_SUFFIX     ""
-#endif
-
-#define DRV_VERSION             "1.2" NAPI_SUFFIX
+#define DRV_VERSION             "1.2"
 #define DRV_NAME                "sis190"
 #define SIS190_DRIVER_NAME      DRV_NAME " Gigabit Ethernet driver " DRV_VERSION
 #define PFX DRV_NAME ": "
 
-#ifdef CONFIG_SIS190_NAPI
-#define sis190_rx_skb                   netif_receive_skb
-#define sis190_rx_quota(count, quota)   min(count, quota)
-#else
 #define sis190_rx_skb                   netif_rx
 #define sis190_rx_quota(count, quota)   count
-#endif
 
 #define MAC_ADDR_LEN            6
 
@@ -1115,10 +1104,8 @@ static void sis190_down(struct net_device *dev)
 
                 synchronize_irq(dev->irq);
 
-                if (!poll_locked) {
-                        netif_poll_disable(dev);
+                if (!poll_locked)
                         poll_locked++;
-                }
 
                 synchronize_sched();
 
@@ -1137,8 +1124,6 @@ static int sis190_close(struct net_device *dev)
 
         free_irq(dev->irq, dev);
 
-        netif_poll_enable(dev);
-
         pci_free_consistent(pdev, TX_RING_BYTES, tp->TxDescRing, tp->tx_dma);
         pci_free_consistent(pdev, RX_RING_BYTES, tp->RxDescRing, tp->rx_dma);