---

yaml --- r: 368631 b: refs/heads/master c: 2fbd8df h: refs/heads/master i: 368629: e6f2d14 368627: 4f2a6c6 368623: 0f8c664 v: v3
git-mirror · Mar 13, 2013 · 02ac103 · 02ac103
1 parent c31db1e
commit 02ac103
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9a8871ac2aab0cc87190f1ab870785b32cc24aa
+refs/heads/master: 2fbd8dfee1dc50407eaf72e30333cf8ce1bba2cb
diff --git a/trunk/drivers/firewire/net.c b/trunk/drivers/firewire/net.c
@@ -1156,6 +1156,9 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
 	unsigned long offset;
 	unsigned u;
 
+	if (dev->broadcast_state != FWNET_BROADCAST_ERROR)
+		return 0;
+
 	max_receive = 1U << (dev->card->max_receive + 1);
 	num_packets = (FWNET_ISO_PAGE_COUNT * PAGE_SIZE) / max_receive;
 
@@ -1258,11 +1261,10 @@ static int fwnet_open(struct net_device *net)
 	if (ret)
 		return ret;
 
-	if (dev->broadcast_state == FWNET_BROADCAST_ERROR) {
-		ret = fwnet_broadcast_start(dev);
-		if (ret)
-			goto out;
-	}
+	ret = fwnet_broadcast_start(dev);
+	if (ret)
+		goto out;
+
 	netif_start_queue(net);
 
 	spin_lock_irq(&dev->lock);