summaryrefslogtreecommitdiff
path: root/drivers/firewire/net.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2013-03-25 12:25:57 +0400
committerDavid S. Miller <davem@davemloft.net>2013-03-26 20:32:13 +0400
commit382c4b4090b7394d079c199ba053a378c6cd45b8 (patch)
treeb2df5212bbadd8a02f7c554da49ef5cf4309238e /drivers/firewire/net.c
parent021b97e469714b31b9e808c91b49543a8766c342 (diff)
downloadlinux-382c4b4090b7394d079c199ba053a378c6cd45b8.tar.xz
firewire net: Allocate address handler before registering net_device.
Allocate FIFO address before registering net_device. This is preparation to change the pseudo hardware address format for firewire devices to include the offset of the FIFO for receipt of unicast datagrams, instead of mangling ARP/NDP messages in the driver layer. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/firewire/net.c')
-rw-r--r--drivers/firewire/net.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 7c2e16a1db4f..72536e7fe95c 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1286,13 +1286,9 @@ static int fwnet_open(struct net_device *net)
struct fwnet_device *dev = netdev_priv(net);
int ret;
- ret = fwnet_fifo_start(dev);
- if (ret)
- return ret;
-
ret = fwnet_broadcast_start(dev);
if (ret)
- goto out;
+ return ret;
netif_start_queue(net);
@@ -1301,9 +1297,6 @@ static int fwnet_open(struct net_device *net)
spin_unlock_irq(&dev->lock);
return 0;
-out:
- fwnet_fifo_stop(dev);
- return ret;
}
/* ifdown */
@@ -1312,9 +1305,7 @@ static int fwnet_stop(struct net_device *net)
struct fwnet_device *dev = netdev_priv(net);
netif_stop_queue(net);
-
fwnet_broadcast_stop(dev);
- fwnet_fifo_stop(dev);
return 0;
}
@@ -1593,6 +1584,11 @@ static int fwnet_probe(struct device *_dev)
dev->card = card;
dev->netdev = net;
+ ret = fwnet_fifo_start(dev);
+ if (ret < 0)
+ goto out;
+ dev->local_fifo = dev->handler.offset;
+
/*
* Use the RFC 2734 default 1500 octets or the maximum payload
* as initial MTU
@@ -1616,10 +1612,10 @@ static int fwnet_probe(struct device *_dev)
if (ret && allocated_netdev) {
unregister_netdev(net);
list_del(&dev->dev_link);
- }
out:
- if (ret && allocated_netdev)
+ fwnet_fifo_stop(dev);
free_netdev(net);
+ }
mutex_unlock(&fwnet_device_mutex);
@@ -1660,6 +1656,8 @@ static int fwnet_remove(struct device *_dev)
if (list_empty(&dev->peer_list)) {
unregister_netdev(net);
+ fwnet_fifo_stop(dev);
+
for (i = 0; dev->queued_datagrams && i < 5; i++)
ssleep(1);
WARN_ON(dev->queued_datagrams);