firewire net: Check dev->broadcast_state inside fwnet_broadcast_start().
YOSHIFUJI Hideaki [Fri, 8 Mar 2013 01:43:14 +0000 (10:43 +0900)]
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

drivers/firewire/net.c

index fbd07eb..9a2634a 100644 (file)
@@ -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);