Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7fab06c0ca89d99442a4baeddf417add585e2672 Commit: 7fab06c0ca89d99442a4baeddf417add585e2672 Parent: 96fd4cd3e40e240f0c385af87f58e74da8b7099a Author: Stephen Hemminger <[EMAIL PROTECTED]> AuthorDate: Sun Oct 28 17:10:08 2007 +0100 Committer: Francois Romieu <[EMAIL PROTECTED]> CommitDate: Sun Oct 28 18:21:01 2007 +0100
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 <[EMAIL PROTECTED]> Signed-off-by: Francois Romieu <[EMAIL PROTECTED]> Cc: Edward Hsu <[EMAIL PROTECTED]> --- 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 e8960f2..c5eaf49 100644 --- 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++; } - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html