Commit d406eafe authored by Linas Vepstas's avatar Linas Vepstas Committed by Jeff Garzik

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: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Cc: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent eb5b5b2f
...@@ -1906,8 +1906,7 @@ spider_net_stop(struct net_device *netdev) ...@@ -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_GHIINT1MSK, 0);
spider_net_write_reg(card, SPIDER_NET_GHIINT2MSK, 0); spider_net_write_reg(card, SPIDER_NET_GHIINT2MSK, 0);
/* free_irq(netdev->irq, netdev);*/ free_irq(netdev->irq, netdev);
free_irq(to_pci_dev(netdev->dev.parent)->irq, netdev);
spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR, spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
SPIDER_NET_DMA_TX_FEND_VALUE); SPIDER_NET_DMA_TX_FEND_VALUE);
...@@ -1919,8 +1918,6 @@ spider_net_stop(struct net_device *netdev) ...@@ -1919,8 +1918,6 @@ spider_net_stop(struct net_device *netdev)
spider_net_release_tx_chain(card, 1); spider_net_release_tx_chain(card, 1);
spider_net_free_rx_chain_contents(card); 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->tx_chain);
spider_net_free_chain(card, &card->rx_chain); spider_net_free_chain(card, &card->rx_chain);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment