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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 22 Aug 2007 18:46:59 -0300 From: Arnaldo Carvalho de Melo <acme@...stprotocols.net> To: "David S. Miller" <davem@...emloft.net> Cc: netdev@...r.kernel.org Subject: [PATCH][VIA-RHINE]: Fix CONFIG_VIA_RHINE_NAPI usage Hi David, napi is broken here, with this patch at least I can isolate this breakage and boot the machine with a non-napi via-rhine driver. Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 8f4cf82..4cecd06 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -390,7 +390,9 @@ struct rhine_private { struct pci_dev *pdev; long pioaddr; struct net_device *dev; +#ifdef CONFIG_VIA_RHINE_NAPI struct napi_struct napi; +#endif struct net_device_stats stats; spinlock_t lock; @@ -1059,9 +1061,9 @@ static void init_registers(struct net_device *dev) iowrite32(rp->tx_ring_dma, ioaddr + TxRingPtr); rhine_set_rx_mode(dev); - +#ifdef CONFIG_VIA_RHINE_NAPI napi_enable(&rp->napi); - +#endif /* Enable interrupts by setting the interrupt mask. */ iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | IntrRxDropped | IntrRxNoBuf | IntrTxAborted | @@ -1836,8 +1838,9 @@ static int rhine_close(struct net_device *dev) spin_lock_irq(&rp->lock); netif_stop_queue(dev); +#ifdef CONFIG_VIA_RHINE_NAPI napi_disable(&rp->napi); - +#endif if (debug > 1) printk(KERN_DEBUG "%s: Shutting down ethercard, " "status was %4.4x.\n", - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists