Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 06:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: most: aim-networking: keep channels closed if ndo_open fails

Browse Source 
This patch stops all started channels whenever the function most_nd_open
returns an error. Additionally, it renames variable wait_res to ret for
the consistency.

Signed-off-by: Andrey Shvetsov <andrey.shvetsov@k2l.de>
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andrey Shvetsov 2016-10-25 17:44:19 +02:00 committed by Greg Kroah-Hartman
parent 54dc7ed37d
commit 1e80e19ce9
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/staging/most/aim-network/networking.c
View File

@ -181,7 +181,7 @@ static int most_nd_set_mac_address(struct net_device *dev, void *p)
static int most_nd_open(struct net_device *dev)
{
struct net_dev_context *nd = dev->ml_priv;
long wait_res;
long ret;
netdev_info(dev, "open net device\n");
@ -203,26 +203,30 @@ static int most_nd_open(struct net_device *dev)
return -EBUSY;
}
if (!is_valid_ether_addr(dev->dev_addr)) {
nd->iface->request_netinfo(nd->iface, nd->tx.ch_id);
ret = wait_for_completion_interruptible_timeout(
&nd->mac_compl, msecs_to_jiffies(5000));
if (!ret) {
netdev_err(dev, "mac timeout\n");
ret = -EBUSY;
goto err;
}
if (ret < 0) {
netdev_warn(dev, "mac waiting interrupted\n");
goto err;
}
}
nd->channels_opened = true;
netif_wake_queue(dev);
if (is_valid_ether_addr(dev->dev_addr))
return 0;
nd->iface->request_netinfo(nd->iface, nd->tx.ch_id);
wait_res = wait_for_completion_interruptible_timeout(
&nd->mac_compl, msecs_to_jiffies(5000));
if (!wait_res) {
netdev_err(dev, "mac timeout\n");
return -EBUSY;
}
if (wait_res < 0) {
netdev_warn(dev, "mac waiting interrupted\n");
return wait_res;
}
return 0;
err:
most_stop_channel(nd->iface, nd->tx.ch_id, &aim);
most_stop_channel(nd->iface, nd->rx.ch_id, &aim);
return ret;
}
static int most_nd_stop(struct net_device *dev)