diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-10-28 12:10:08 -0400 |
---|---|---|
committer | Francois Romieu <romieu@fr.zoreil.com> | 2007-10-28 13:21:01 -0400 |
commit | 7fab06c0ca89d99442a4baeddf417add585e2672 (patch) | |
tree | 792cca5fd8a5d023779ad84dad33b980c6618ee3 /drivers/net/r8169.c | |
parent | 96fd4cd3e40e240f0c385af87f58e74da8b7099a (diff) |
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>
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index e8960f294a6e..c5eaf4931a91 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -392,7 +392,9 @@ struct rtl8169_private { | |||
392 | void __iomem *mmio_addr; /* memory map physical address */ | 392 | void __iomem *mmio_addr; /* memory map physical address */ |
393 | struct pci_dev *pci_dev; /* Index of PCI device */ | 393 | struct pci_dev *pci_dev; /* Index of PCI device */ |
394 | struct net_device *dev; | 394 | struct net_device *dev; |
395 | #ifdef CONFIG_R8169_NAPI | ||
395 | struct napi_struct napi; | 396 | struct napi_struct napi; |
397 | #endif | ||
396 | spinlock_t lock; /* spin lock flag */ | 398 | spinlock_t lock; /* spin lock flag */ |
397 | u32 msg_enable; | 399 | u32 msg_enable; |
398 | int chipset; | 400 | int chipset; |
@@ -3010,7 +3012,9 @@ core_down: | |||
3010 | synchronize_irq(dev->irq); | 3012 | synchronize_irq(dev->irq); |
3011 | 3013 | ||
3012 | if (!poll_locked) { | 3014 | if (!poll_locked) { |
3015 | #ifdef CONFIG_R8169_NAPI | ||
3013 | napi_disable(&tp->napi); | 3016 | napi_disable(&tp->napi); |
3017 | #endif | ||
3014 | poll_locked++; | 3018 | poll_locked++; |
3015 | } | 3019 | } |
3016 | 3020 | ||