| From fd6e406653934e780611f3a8ec8a16e49f7fa58a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 28 May 2020 11:19:17 -0500 |
| Subject: drivers/net/ibmvnic: Update VNIC protocol version reporting |
| |
| From: Thomas Falcon <tlfalcon@linux.ibm.com> |
| |
| [ Upstream commit 784688993ebac34dffe44a9f2fabbe126ebfd4db ] |
| |
| VNIC protocol version is reported in big-endian format, but it |
| is not byteswapped before logging. Fix that, and remove version |
| comparison as only one protocol version exists at this time. |
| |
| Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/ibm/ibmvnic.c | 8 +++----- |
| 1 file changed, 3 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c |
| index aaa03ce5796f..5a42ddeecfe5 100644 |
| --- a/drivers/net/ethernet/ibm/ibmvnic.c |
| +++ b/drivers/net/ethernet/ibm/ibmvnic.c |
| @@ -4536,12 +4536,10 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq, |
| dev_err(dev, "Error %ld in VERSION_EXCHG_RSP\n", rc); |
| break; |
| } |
| - dev_info(dev, "Partner protocol version is %d\n", |
| - crq->version_exchange_rsp.version); |
| - if (be16_to_cpu(crq->version_exchange_rsp.version) < |
| - ibmvnic_version) |
| - ibmvnic_version = |
| + ibmvnic_version = |
| be16_to_cpu(crq->version_exchange_rsp.version); |
| + dev_info(dev, "Partner protocol version is %d\n", |
| + ibmvnic_version); |
| send_cap_queries(adapter); |
| break; |
| case QUERY_CAPABILITY_RSP: |
| -- |
| 2.25.1 |
| |
