iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firewire net: Check dev->broadcast_state inside fwnet_broadcast_start().

Browse Source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
YOSHIFUJI Hideaki 2013-03-08 10:43:14 +09:00 committed by Stefan Richter
parent b9a8871ac2
commit 2fbd8dfee1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/firewire/net.c
View File

@ -1156,6 +1156,9 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
unsigned long offset; unsigned long offset;
unsigned u; unsigned u;
if (dev->broadcast_state != FWNET_BROADCAST_ERROR)
return 0;
max_receive = 1U << (dev->card->max_receive + 1); max_receive = 1U << (dev->card->max_receive + 1);
num_packets = (FWNET_ISO_PAGE_COUNT * PAGE_SIZE) / max_receive; num_packets = (FWNET_ISO_PAGE_COUNT * PAGE_SIZE) / max_receive;
@ -1258,11 +1261,10 @@ static int fwnet_open(struct net_device *net)
if (ret) if (ret)
return ret; return ret;
if (dev->broadcast_state == FWNET_BROADCAST_ERROR) {
ret = fwnet_broadcast_start(dev); ret = fwnet_broadcast_start(dev);
if (ret) if (ret)
goto out; goto out;
}
netif_start_queue(net); netif_start_queue(net);
spin_lock_irq(&dev->lock); spin_lock_irq(&dev->lock);