lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r8169: napi config

Browse Source 
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>
This commit is contained in:
Stephen Hemminger
2007-10-28 17:10:08 +01:00
committed by Francois Romieu
parent 96fd4cd3e4
commit 7fab06c0ca
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/r8169.c
View File

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