ibmvnic: set up 200GBPS speed

[ Upstream commit b9cd795b0e4860f482bf3741d12e1c8f3ec1cfc9 ]

Set up the speed according to crq->query_phys_parms.rsp.speed.
Fix IBMVNIC_10GBPS typo.

Fixes: f8d6ae0d27ec ("ibmvnic: Report actual backing device speed and duplex values")
Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 4dd3625a4fbc8b8a7ff0a1a05b4bf79dedb60334..3e0aab04d86fb2f6d025c49ddf12ab469795d9c1 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -4610,7 +4610,7 @@ static int handle_query_phys_parms_rsp(union ibmvnic_crq *crq,
        case IBMVNIC_1GBPS:
                adapter->speed = SPEED_1000;
                break;
-       case IBMVNIC_10GBP:
+       case IBMVNIC_10GBPS:
                adapter->speed = SPEED_10000;
                break;
        case IBMVNIC_25GBPS:
@@ -4625,6 +4625,9 @@ static int handle_query_phys_parms_rsp(union ibmvnic_crq *crq,
        case IBMVNIC_100GBPS:
                adapter->speed = SPEED_100000;
                break;
+       case IBMVNIC_200GBPS:
+               adapter->speed = SPEED_200000;
+               break;
        default:
                if (netif_carrier_ok(netdev))
                        netdev_warn(netdev, "Unknown speed 0x%08x\n", rspeed);

diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
index f8416e1d4cf0942fd013faa6cefa85e552fb0849..43feb96b0a68a8169b199ff92fd6e684a5149bd5 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.h
+++ b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -373,7 +373,7 @@ struct ibmvnic_phys_parms {
 #define IBMVNIC_10MBPS         0x40000000
 #define IBMVNIC_100MBPS                0x20000000
 #define IBMVNIC_1GBPS          0x10000000
-#define IBMVNIC_10GBP          0x08000000
+#define IBMVNIC_10GBPS         0x08000000
 #define IBMVNIC_40GBPS         0x04000000
 #define IBMVNIC_100GBPS                0x02000000
 #define IBMVNIC_25GBPS         0x01000000