Commit 491099ad authored by Lijun Pan's avatar Lijun Pan Committed by David S. Miller
Browse files

ibmvnic: rename send_cap_queries to send_query_cap 



The new name send_query_cap pairs with handle_query_cap_rsp.

Signed-off-by: default avatarLijun Pan <ljp@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9cd795b

drivers/net/ethernet/ibm/ibmvnic.c

+4 −4
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void send_map_query(struct ibmvnic_adapter *adapter); 
static int send_request_map(struct ibmvnic_adapter *, dma_addr_t, __be32, u8);

static int send_request_unmap(struct ibmvnic_adapter *, u8);

static int send_login(struct ibmvnic_adapter *adapter);

static void send_cap_queries(struct ibmvnic_adapter *adapter);

static void send_query_cap(struct ibmvnic_adapter *adapter);

static int init_sub_crqs(struct ibmvnic_adapter *);

static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter);

static int ibmvnic_reset_init(struct ibmvnic_adapter *, bool reset);
@@ -882,7 +882,7 @@ static int ibmvnic_login(struct net_device *netdev) 
				   "Received partial success, retrying...\n");

			adapter->init_done_rc = 0;

			reinit_completion(&adapter->init_done);

			send_cap_queries(adapter);

			send_query_cap(adapter);

			if (!wait_for_completion_timeout(&adapter->init_done,

							 timeout)) {

				netdev_warn(netdev,
@@ -3836,7 +3836,7 @@ static void send_map_query(struct ibmvnic_adapter *adapter) 
}



/* Send a series of CRQs requesting various capabilities of the VNIC server */

static void send_cap_queries(struct ibmvnic_adapter *adapter)

static void send_query_cap(struct ibmvnic_adapter *adapter)

{

	union ibmvnic_crq crq;
@@ -4750,7 +4750,7 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq, 
			    be16_to_cpu(crq->version_exchange_rsp.version);

		dev_info(dev, "Partner protocol version is %d\n",

			 ibmvnic_version);

		send_cap_queries(adapter);

		send_query_cap(adapter);

		break;

	case QUERY_CAPABILITY_RSP:

		handle_query_cap_rsp(crq, adapter);