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>
This commit is contained in:
Stefan Richter 2007-04-02 02:16:40 +02:00
parent 5009d26961
commit 246a5fdade

View file

@ -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)