Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 343a8d13 authored by Casey Leedom's avatar Casey Leedom Committed by David S. Miller
Browse files

cxgb4vf: recover from failure in cxgb4vf_open() 



If the Link Start fails in cxgb4vf_open(), we need to back out any state
that we've built up ...

Signed-off-by: default avatarCasey Leedom <leedom@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60dbb011

drivers/net/cxgb4vf/cxgb4vf_main.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -749,13 +749,19 @@ static int cxgb4vf_open(struct net_device *dev) 
	netif_set_real_num_tx_queues(dev, pi->nqsets);

	netif_set_real_num_tx_queues(dev, pi->nqsets);

	err = netif_set_real_num_rx_queues(dev, pi->nqsets);

	err = netif_set_real_num_rx_queues(dev, pi->nqsets);

	if (err)

	if (err)

		return err;

		goto err_unwind;

	set_bit(pi->port_id, &adapter->open_device_map);

	err = link_start(dev);

	err = link_start(dev);

	if (err)

	if (err)

		return err;

		goto err_unwind;



	netif_tx_start_all_queues(dev);

	netif_tx_start_all_queues(dev);

	set_bit(pi->port_id, &adapter->open_device_map);

	return 0;

	return 0;



err_unwind:

	if (adapter->open_device_map == 0)

		adapter_down(adapter);

	return err;

}

}





/*

/*
@@ -764,13 +770,12 @@ static int cxgb4vf_open(struct net_device *dev) 
 */

 */

static int cxgb4vf_stop(struct net_device *dev)

static int cxgb4vf_stop(struct net_device *dev)

{

{

	int ret;

	struct port_info *pi = netdev_priv(dev);

	struct port_info *pi = netdev_priv(dev);

	struct adapter *adapter = pi->adapter;

	struct adapter *adapter = pi->adapter;





	netif_tx_stop_all_queues(dev);

	netif_tx_stop_all_queues(dev);

	netif_carrier_off(dev);

	netif_carrier_off(dev);

	ret = t4vf_enable_vi(adapter, pi->viid, false, false);

	t4vf_enable_vi(adapter, pi->viid, false, false);

	pi->link_cfg.link_ok = 0;

	pi->link_cfg.link_ok = 0;





	clear_bit(pi->port_id, &adapter->open_device_map);

	clear_bit(pi->port_id, &adapter->open_device_map);