From 02ac103eac528e09dd7e3c3c02d06bafb3c120e4 Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Fri, 8 Mar 2013 10:43:14 +0900
Subject: [PATCH] --- yaml --- r: 368631 b: refs/heads/master c:
 2fbd8dfee1dc50407eaf72e30333cf8ce1bba2cb h: refs/heads/master i:   368629:
 e6f2d14b8e8297d20053eb978cd53387d5a0e860   368627:
 4f2a6c6bb10b206ddf3d45db150b0d398ad8298f   368623:
 0f8c66472d62e96af59439d64686a41a7992d61c v: v3

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

diff --git a/[refs] b/[refs]
index 761604cde61c..b4fd5495a1d6 100644
--- 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
index fbd07ebd3f5f..9a2634ad6426 100644
--- 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);