* [RFC net-next 04/11] firewire net: Check dev->broadcast_state inside fwnet_broadcast_start().
@ 2013-03-08 1:43 YOSHIFUJI Hideaki
0 siblings, 0 replies; only message in thread
From: YOSHIFUJI Hideaki @ 2013-03-08 1:43 UTC (permalink / raw)
To: stefanr, linux1394-devel; +Cc: netdev
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
drivers/firewire/net.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index fbd07eb..9a2634a 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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-08 1:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-08 1:43 [RFC net-next 04/11] firewire net: Check dev->broadcast_state inside fwnet_broadcast_start() YOSHIFUJI Hideaki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).