r8169: napi config

Don't call napi_disable if not configured and make sure that any
misuse of napi_xxx in future fails with a compile error.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index e8960f294a6e04d8cfe5ed0b2cc5469bf4ebd918..c5eaf4931a9189601abd1e7dd5cb3c96274f3cbb 100644 (file)
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -392,7 +392,9 @@ struct rtl8169_private {
        void __iomem *mmio_addr;        /* memory map physical address */
        struct pci_dev *pci_dev;        /* Index of PCI device */
        struct net_device *dev;
+#ifdef CONFIG_R8169_NAPI
        struct napi_struct napi;
+#endif
        spinlock_t lock;                /* spin lock flag */
        u32 msg_enable;
        int chipset;
@@ -3010,7 +3012,9 @@ core_down:
        synchronize_irq(dev->irq);
 
        if (!poll_locked) {
+#ifdef CONFIG_R8169_NAPI
                napi_disable(&tp->napi);
+#endif
                poll_locked++;
        }