---

yaml --- r: 368638 b: refs/heads/master c: 8559e7f h: refs/heads/master v: v3
git-mirror · Mar 13, 2013 · fc43376 · fc43376
1 parent 36103f3
commit fc43376
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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);