Unverified Commit d0e1969f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11201 ibmvnic: don't release napi in __ibmvnic_open() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FB4N4XHIVGLMPZUGL33XDHLJOTSWMRYF/ 
 
https://gitee.com/src-openeuler/kernel/issues/IADGL6 
 
Link:https://gitee.com/openeuler/kernel/pulls/11201

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 55bfa7d3 c866b260

drivers/net/ethernet/ibm/ibmvnic.c

+6 −2
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static void release_crq_queue(struct ibmvnic_adapter *); 
static int __ibmvnic_set_mac(struct net_device *, u8 *);

static int init_crq_queue(struct ibmvnic_adapter *adapter);

static int send_query_phys_parms(struct ibmvnic_adapter *adapter);

static void ibmvnic_disable_irqs(struct ibmvnic_adapter *adapter);



struct ibmvnic_stat {

	char name[ETH_GSTRING_LEN];
@@ -1177,7 +1178,7 @@ static int __ibmvnic_open(struct net_device *netdev) 
	rc = set_link_state(adapter, IBMVNIC_LOGICAL_LNK_UP);

	if (rc) {

		ibmvnic_napi_disable(adapter);

		release_resources(adapter);

		ibmvnic_disable_irqs(adapter);

		return rc;

	}
@@ -1213,7 +1214,6 @@ static int ibmvnic_open(struct net_device *netdev) 
		rc = init_resources(adapter);

		if (rc) {

			netdev_err(netdev, "failed to initialize resources\n");

			release_resources(adapter);

			goto out;

		}

	}
@@ -1229,6 +1229,10 @@ static int ibmvnic_open(struct net_device *netdev) 
		adapter->state = VNIC_OPEN;

		rc = 0;

	}



	if (rc)

		release_resources(adapter);



	return rc;

}