[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070210001402.GA2396@austin.ibm.com>
Date: Fri, 9 Feb 2007 18:14:02 -0600
From: linas@...tin.ibm.com (Linas Vepstas)
To: jgarzik@...ox.com
Cc: linuxppc-dev@...abs.org, netdev@...r.kernel.org,
James K Lewis <jklewis@...ibm.com>,
Jens Osterkamp <Jens.Osterkamp@...ibm.com>,
Kou Ishizaki <kou.ishizaki@...hiba.co.jp>
Subject: [PATCH 1/5]: 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 interface.
Signed-off-by: Linas Vepstas <linas@...tin.ibm.com>
Cc: James K Lewis <jklewis@...ibm.com>
Cc: Jens Osterkamp <Jens.Osterkamp@...ibm.com>
Cc: Kou Ishizaki <kou.ishizaki@...hiba.co.jp>
----
drivers/net/spider_net.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
Index: linux-2.6.20-git4/drivers/net/spider_net.c
===================================================================
--- linux-2.6.20-git4.orig/drivers/net/spider_net.c 2007-02-09 17:22:35.000000000 -0600
+++ linux-2.6.20-git4/drivers/net/spider_net.c 2007-02-09 17:24:04.000000000 -0600
@@ -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->class_dev.dev)->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);
-
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