[<prev] [next>] [<thread-prev] [thread-next>] [month] [year] [list]
Date: Mon, 2 Apr 2007 02:16:40 +0200 (CEST)
From: Stefan Richter <stefanr@...6.in-berlin.de>
To: linux1394-devel@...ts.sourceforge.net
Subject: [PATCH linux1394-2.6.git 06/15] ieee1394: eth1394: contain host reset
Call only eth1394's own host reset handler from .tx_timeout, not the
reset hooks of all other IEEE 1394 drivers.
A minor drawback of this patch is that ether1394_host_reset by timeout
is not serialized against ether1394_host_reset by bus reset.
Signed-off-by: Stefan Richter <stefanr@...6.in-berlin.de>
---
drivers/ieee1394/eth1394.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Index: linux/drivers/ieee1394/eth1394.c
===================================================================
--- linux.orig/drivers/ieee1394/eth1394.c
+++ linux/drivers/ieee1394/eth1394.c
@@ -258,10 +258,8 @@ static void ether1394_tx_timeout(struct
struct hpsb_host *host =
((struct eth1394_priv *)netdev_priv(dev))->host;
- ETH1394_PRINT(KERN_ERR, dev->name, "Timeout, resetting host %s\n",
- host->driver->name);
- highlevel_host_reset(host);
- netif_wake_queue(dev);
+ ETH1394_PRINT(KERN_ERR, dev->name, "Timeout, resetting host\n");
+ ether1394_host_reset(host);
}
static int ether1394_change_mtu(struct net_device *dev, int new_mtu)
--
Stefan Richter
-=====-=-=== -=-- ---=-
http://arcgraph.de/sr/
-
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
Hosted by DataForce ISP -
Powered by Openwall GNU/*/Linux