Skip to content

Commit

Permalink
firewire net: Check dev->broadcast_state inside fwnet_broadcast_start().
Browse files Browse the repository at this point in the history
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
  • Loading branch information
YOSHIFUJI Hideaki authored and Stefan Richter committed Mar 13, 2013
1 parent b9a8871 commit 2fbd8df
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/firewire/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 2fbd8df

Please sign in to comment.