From fc43376470583353fc8837b11900a5f2192ca30c Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Fri, 8 Mar 2013 10:45:57 +0900
Subject: [PATCH] --- yaml --- r: 368638 b: refs/heads/master c:
 8559e7f0694e3fb192aab00a495be5a510afc8c3 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/firewire/net.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d7da9ebd7ede..76e3f32f1ccf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 111534cd7a376b75e72ddea0c6d00ec956ce3343
+refs/heads/master: 8559e7f0694e3fb192aab00a495be5a510afc8c3
diff --git a/trunk/drivers/firewire/net.c b/trunk/drivers/firewire/net.c
index ca41446d62f4..c1898adeb900 100644
--- a/trunk/drivers/firewire/net.c
+++ b/trunk/drivers/firewire/net.c
@@ -1295,9 +1295,12 @@ static int fwnet_open(struct net_device *net)
 /* ifdown */
 static int fwnet_stop(struct net_device *net)
 {
+	struct fwnet_device *dev = netdev_priv(net);
+
 	netif_stop_queue(net);
 
-	/* Deallocate iso context for use by other applications? */
+	fwnet_broadcast_stop(dev);
+	fwnet_fifo_stop(dev);
 
 	return 0;
 }
@@ -1638,9 +1641,6 @@ static int fwnet_remove(struct device *_dev)
 	if (list_empty(&dev->peer_list)) {
 		unregister_netdev(net);
 
-		fwnet_fifo_stop(dev);
-		fwnet_broadcast_stop(dev);
-
 		for (i = 0; dev->queued_datagrams && i < 5; i++)
 			ssleep(1);
 		WARN_ON(dev->queued_datagrams);