lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20071026113305.57dea765@freepuppy.rosehill> Date: Fri, 26 Oct 2007 11:33:05 -0700 From: Stephen Hemminger <shemminger@...ux-foundation.org> To: Ingo Molnar <mingo@...e.hu>, Francois Romieu <romieu@...zoreil.com>, Jeff Garzik <jeff@...zik.org> Cc: Romano Giannetti <romanol@...omillas.es>, Peter Zijlstra <a.p.zijlstra@...llo.nl>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org, Edward Hsu <edward_hsu@...ltek.com.tw>, Andrew Morton <akpm@...ux-foundation.org> Subject: [PATCH] r8169: don't call napi_disable if not doing NAPI 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@...ux-foundation.org> --- a/drivers/net/r8169.c 2007-10-24 21:38:43.000000000 -0700 +++ b/drivers/net/r8169.c 2007-10-26 11:27:02.000000000 -0700 @@ -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; @@ -2989,13 +2991,16 @@ static void rtl8169_down(struct net_devi { struct rtl8169_private *tp = netdev_priv(dev); void __iomem *ioaddr = tp->mmio_addr; - unsigned int poll_locked = 0; unsigned int intrmask; rtl8169_delete_timer(dev); netif_stop_queue(dev); +#ifdef CONFIG_R8169_NAPI + napi_disable(&tp->napi); +#endif + core_down: spin_lock_irq(&tp->lock); @@ -3009,11 +3014,6 @@ core_down: synchronize_irq(dev->irq); - if (!poll_locked) { - napi_disable(&tp->napi); - poll_locked++; - } - /* Give a racing hard_start_xmit a few cycles to complete. */ synchronize_sched(); /* FIXME: should this be synchronize_irq()? */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists