diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2013-03-08 10:45:57 +0900 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2013-03-13 16:11:12 +0100 |
| commit | 8559e7f0694e3fb192aab00a495be5a510afc8c3 (patch) | |
| tree | 56f62f2429cdcff407aed73e554d91c15ffa4665 /drivers/firewire | |
| parent | 111534cd7a376b75e72ddea0c6d00ec956ce3343 (diff) | |
| download | linux-8559e7f0694e3fb192aab00a495be5a510afc8c3.tar.gz linux-8559e7f0694e3fb192aab00a495be5a510afc8c3.tar.bz2 linux-8559e7f0694e3fb192aab00a495be5a510afc8c3.zip | |
firewire net: Release broadcast/fifo resources on ifdown.
Since those resources are allocated on ifup, relsase them on ifdown.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index ca41446d62f4..c1898adeb900 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -1295,9 +1295,12 @@ out: /* ifdown */ static int fwnet_stop(struct net_device *net) { + struct fwnet_device *dev = netdev_priv(net); + netif_stop_queue(net); - /* Deallocate iso context for use by other applications? */ + fwnet_broadcast_stop(dev); + fwnet_fifo_stop(dev); return 0; } @@ -1638,9 +1641,6 @@ static int fwnet_remove(struct device *_dev) if (list_empty(&dev->peer_list)) { unregister_netdev(net); - fwnet_fifo_stop(dev); - fwnet_broadcast_stop(dev); - for (i = 0; dev->queued_datagrams && i < 5; i++) ssleep(1); WARN_ON(dev->queued_datagrams); |