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

firewire net: Allocate address handler before registering net_device.

Browse Source 
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>
This commit is contained in:
YOSHIFUJI Hideaki / 吉藤英明 2013-03-25 08:25:57 +00:00 committed by David S. Miller
parent 021b97e469
commit 382c4b4090
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/firewire/net.c
View File

@ -1286,13 +1286,9 @@ static int fwnet_open(struct net_device *net)
struct fwnet_device *dev = netdev_priv(net); struct fwnet_device *dev = netdev_priv(net);
int ret; int ret;
ret = fwnet_fifo_start(dev);
if (ret)
return ret;
ret = fwnet_broadcast_start(dev); ret = fwnet_broadcast_start(dev);
if (ret) if (ret)
goto out; return ret;
netif_start_queue(net); netif_start_queue(net);
@ -1301,9 +1297,6 @@ static int fwnet_open(struct net_device *net)
spin_unlock_irq(&dev->lock); spin_unlock_irq(&dev->lock);
return 0; return 0;
out:
fwnet_fifo_stop(dev);
return ret;
} }
/* ifdown */ /* ifdown */
@ -1312,9 +1305,7 @@ static int fwnet_stop(struct net_device *net)
struct fwnet_device *dev = netdev_priv(net); struct fwnet_device *dev = netdev_priv(net);
netif_stop_queue(net); netif_stop_queue(net);
fwnet_broadcast_stop(dev); fwnet_broadcast_stop(dev);
fwnet_fifo_stop(dev);
return 0; return 0;
} }
@ -1593,6 +1584,11 @@ static int fwnet_probe(struct device *_dev)
dev->card = card; dev->card = card;
dev->netdev = net; 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 * Use the RFC 2734 default 1500 octets or the maximum payload
* as initial MTU * as initial MTU
@ -1616,10 +1612,10 @@ static int fwnet_probe(struct device *_dev)
if (ret && allocated_netdev) { if (ret && allocated_netdev) {
unregister_netdev(net); unregister_netdev(net);
list_del(&dev->dev_link); list_del(&dev->dev_link);
}
out: out:
if (ret && allocated_netdev) fwnet_fifo_stop(dev);
free_netdev(net); free_netdev(net);
}
mutex_unlock(&fwnet_device_mutex); mutex_unlock(&fwnet_device_mutex);
@ -1660,6 +1656,8 @@ static int fwnet_remove(struct device *_dev)
if (list_empty(&dev->peer_list)) { if (list_empty(&dev->peer_list)) {
unregister_netdev(net); unregister_netdev(net);
fwnet_fifo_stop(dev);
for (i = 0; dev->queued_datagrams && i < 5; i++) for (i = 0; dev->queued_datagrams && i < 5; i++)
ssleep(1); ssleep(1);
WARN_ON(dev->queued_datagrams); WARN_ON(dev->queued_datagrams);