The patch titled
spidernet: compile break
has been removed from the -mm tree. Its filename was
spidernet-compile-break.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: spidernet: compile break
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/spider_net.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff -puN drivers/net/spider_net.c~spidernet-compile-break drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~spidernet-compile-break
+++ a/drivers/net/spider_net.c
@@ -1906,8 +1906,7 @@ spider_net_stop(struct net_device *netde
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 *netde
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);
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
s2io-add-pci-error-recovery-support.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
