Commit:     246a5fdade88cbeba09d07c69f67444a24a57d79
Parent:     5009d269610b4c89761dcae296d9717f2f48234b
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Mon Apr 2 02:16:40 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Mon Apr 30 00:00:31 2007 +0200

    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 <[EMAIL PROTECTED]>
 drivers/ieee1394/eth1394.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 049f095..8f19f5b 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)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to