From 2fbd8dfee1dc50407eaf72e30333cf8ce1bba2cb Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Fri, 8 Mar 2013 10:43:14 +0900 Subject: firewire net: Check dev->broadcast_state inside fwnet_broadcast_start(). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: Stefan Richter --- drivers/firewire/net.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'drivers/firewire') diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index fbd07ebd3f5f..9a2634ad6426 100644 --- a/drivers/firewire/net.c +++ b/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); -- cgit v1.2.3-58-ga151