aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-04-02 02:16:40 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-04-30 00:00:31 +0200
commit246a5fdade88cbeba09d07c69f67444a24a57d79 (patch)
tree695207ff9dc22d6b524517262fef9a05856f7bc9 /drivers
parent5009d269610b4c89761dcae296d9717f2f48234b (diff)
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@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ieee1394/eth1394.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 049f095ddff..8f19f5b77a5 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -258,10 +258,8 @@ static void ether1394_tx_timeout(struct net_device *dev)
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)