[<prev] [next>] [day] [month] [year] [list]
Message-ID: <51394232.6010704@linux-ipv6.org>
Date: Fri, 08 Mar 2013 10:43:14 +0900
From: YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org>
To: stefanr@...6.in-berlin.de, linux1394-devel@...ts.sourceforge.net
CC: netdev@...r.kernel.org
Subject: [RFC net-next 04/11] firewire net: Check dev->broadcast_state inside
fwnet_broadcast_start().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@...ux-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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists