diff options
| author |   Arthur Kiyanovski <akiyano@amazon.com> | 2020-05-03 09:52:11 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-03 15:59:29 -0700 |
| commit | e9a1de378dd46375f9abfd8de1e6f59ee114a793 (patch) | |
| tree | fd084647f0b627ac9a691c15abae0eb0bfaeee4d /drivers/net/ethernet/amazon/ena/ena_com.c | |
| parent | net: ena: avoid unnecessary admin command when RSS function set fails (diff) | |
| download | linux-dev-e9a1de378dd46375f9abfd8de1e6f59ee114a793.tar.xz linux-dev-e9a1de378dd46375f9abfd8de1e6f59ee114a793.zip | |
net: ena: fix error returning in ena_com_get_hash_function()
In case the "func" parameter is NULL we now return "-EINVAL".
This shouldn't happen in general, but when it does happen, this is the
proper way to handle it.
We also check func for NULL in the beginning of the function, as there
is no reason to do all the work and realize in the end of the function
it was useless.
Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amazon/ena/ena_com.c')
| -rw-r--r-- | drivers/net/ethernet/amazon/ena/ena_com.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c index 424ba08955e9..66edc86c41c9 100644 --- a/drivers/net/ethernet/amazon/ena/ena_com.c +++ b/drivers/net/ethernet/amazon/ena/ena_com.c @@ -2347,6 +2347,9 @@ int ena_com_get_hash_function(struct ena_com_dev *ena_dev, rss->hash_key; int rc; + if (unlikely(!func)) + return -EINVAL; + rc = ena_com_get_feature_ex(ena_dev, &get_resp, ENA_ADMIN_RSS_HASH_FUNCTION, rss->hash_key_dma_addr, @@ -2359,8 +2362,7 @@ int ena_com_get_hash_function(struct ena_com_dev *ena_dev, if (rss->hash_func) rss->hash_func--; - if (func) - *func = rss->hash_func; + *func = rss->hash_func; if (key) memcpy(key, hash_key->key, (size_t)(hash_key->keys_num) << 2); |