net: ena: changes to RSS hash key allocation

[sfrench/cifs-2.6.git] / drivers / net / ethernet / amazon / ena / ena_com.c

diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c
index d428d0606166c168be1bb2f51c51dff71223e391..b51bf62af11bd3facee9c125c8ab3a7df58217a8 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_com.c
@@ -1067,16 +1067,10 @@ static void ena_com_hash_key_fill_default_key(struct ena_com_dev *ena_dev)
 static int ena_com_hash_key_allocate(struct ena_com_dev *ena_dev)
 {
        struct ena_rss *rss = &ena_dev->rss;
-       struct ena_admin_get_feat_resp get_resp;
-       int rc;
 
-       rc = ena_com_get_feature_ex(ena_dev, &get_resp,
-                                   ENA_ADMIN_RSS_HASH_FUNCTION,
-                                   ena_dev->rss.hash_key_dma_addr,
-                                   sizeof(ena_dev->rss.hash_key), 0);
-       if (unlikely(rc)) {
+       if (!ena_com_check_supported_feature_id(ena_dev,
+                                               ENA_ADMIN_RSS_HASH_FUNCTION))
                return -EOPNOTSUPP;
-       }
 
        rss->hash_key =
                dma_alloc_coherent(ena_dev->dmadev, sizeof(*rss->hash_key),
@@ -2650,10 +2644,10 @@ int ena_com_rss_init(struct ena_com_dev *ena_dev, u16 indr_tbl_log_size)
         * ignore this error and have indirection table support only.
         */
        rc = ena_com_hash_key_allocate(ena_dev);
-       if (unlikely(rc) && rc != -EOPNOTSUPP)
-               goto err_hash_key;
-       else if (rc != -EOPNOTSUPP)
+       if (likely(!rc))
                ena_com_hash_key_fill_default_key(ena_dev);
+       else if (rc != -EOPNOTSUPP)
+               goto err_hash_key;
 
        rc = ena_com_hash_ctrl_init(ena_dev);
        if (unlikely(rc))