netdev - [PATCH -next] 3c515: fix using pnp_get_resource when CONFIG

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20080516103524.0b00ffb6.randy.dunlap@oracle.com>
Date:	Fri, 16 May 2008 10:35:24 -0700
From:	Randy Dunlap <randy.dunlap@...cle.com>
To:	netdev <netdev@...r.kernel.org>, jgarzik <jgarzik@...ox.com>
Cc:	linux-next@...r.kernel.org, bjorn.helgaas@...com,
	akpm <akpm@...ux-foundation.org>
Subject: [PATCH -next] 3c515: fix using pnp_get_resource when
 CONFIG_ISAPNP=n

From: Randy Dunlap <randy.dunlap@...cle.com>

3c515.c uses pnp_irq(), which calls pnp_get_resource(),
which is not defined when CONFIG_PNP=n, so in that case,
get the IRQ from a hardware register.

3c515.c:(.text+0x3adc0): undefined reference to `pnp_get_resource'

Signed-off-by: Randy Dunlap <randy.dunlap@...cle.com>
---
 drivers/net/3c515.c |    4 ++++
 1 file changed, 4 insertions(+)

--- next-20080516.orig/drivers/net/3c515.c
+++ next-20080516/drivers/net/3c515.c
@@ -572,12 +572,16 @@ static int corkscrew_setup(struct net_de
 	int irq;
 	DECLARE_MAC_BUF(mac);
 
+#ifdef __ISAPNP__
 	if (idev) {
 		irq = pnp_irq(idev, 0);
 		vp->dev = &idev->dev;
 	} else {
 		irq = inw(ioaddr + 0x2002) & 15;
 	}
+#else
+	irq = inw(ioaddr + 0x2002) & 15;
+#endif
 
 	dev->base_addr = ioaddr;
 	dev->irq = irq;
--
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