diff options
| author | Linas Vepstas <linas@austin.ibm.com> | 2007-02-20 16:32:00 -0600 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-27 04:16:02 -0500 |
| commit | d406eafee814c0e20af00a9a74f68f6993d8cb9c (patch) | |
| tree | 15f23a76790f1609d9dc30cc9dd162a76ec04ea3 /drivers/net/spider_net.c | |
| parent | eb5b5b2ff96e8f3a42a46378968a166bb56bd900 (diff) | |
| download | op-kernel-dev-d406eafee814c0e20af00a9a74f68f6993d8cb9c.zip op-kernel-dev-d406eafee814c0e20af00a9a74f68f6993d8cb9c.tar.gz | |
spidernet: compile break.
As of 2.6.20-git4, the spider_net driver does not compile.
This appears to be due to some archaic usage involving kobjects.
It also fixes a nasty double-free during ifdown of the interface.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Cc: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 64ed8ff..de26254 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c @@ -1906,8 +1906,7 @@ spider_net_stop(struct net_device *netdev) spider_net_write_reg(card, SPIDER_NET_GHIINT1MSK, 0); spider_net_write_reg(card, SPIDER_NET_GHIINT2MSK, 0); - /* free_irq(netdev->irq, netdev);*/ - free_irq(to_pci_dev(netdev->dev.parent)->irq, netdev); + free_irq(netdev->irq, netdev); spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR, SPIDER_NET_DMA_TX_FEND_VALUE); @@ -1919,8 +1918,6 @@ spider_net_stop(struct net_device *netdev) spider_net_release_tx_chain(card, 1); spider_net_free_rx_chain_contents(card); - spider_net_free_rx_chain_contents(card); - spider_net_free_chain(card, &card->tx_chain); spider_net_free_chain(card, &card->rx_chain); |
