diff options
author | Ido Barnea <ibarnea@cisco.com> | 2016-07-31 11:16:27 +0300 |
---|---|---|
committer | Ido Barnea <ibarnea@cisco.com> | 2016-07-31 11:21:40 +0300 |
commit | dceb010b01e9f8a0e9c905370d39f149f01cab7e (patch) | |
tree | 562201fb20db07440462f27e4d8b95ad3ce84611 /src/dpdk/drivers/net/fm10k/fm10k_ethdev.c | |
parent | 81c896604a50486d8b658dc559f7b98492d778e5 (diff) |
dpdk 16.07 - merges of final version changes
Diffstat (limited to 'src/dpdk/drivers/net/fm10k/fm10k_ethdev.c')
-rw-r--r-- | src/dpdk/drivers/net/fm10k/fm10k_ethdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dpdk/drivers/net/fm10k/fm10k_ethdev.c b/src/dpdk/drivers/net/fm10k/fm10k_ethdev.c index 144b2de8..01f4a72c 100644 --- a/src/dpdk/drivers/net/fm10k/fm10k_ethdev.c +++ b/src/dpdk/drivers/net/fm10k/fm10k_ethdev.c @@ -2159,8 +2159,8 @@ fm10k_rss_hash_update(struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); - if (rss_conf->rss_key_len < FM10K_RSSRK_SIZE * - FM10K_RSSRK_ENTRIES_PER_REG) + if (key && (rss_conf->rss_key_len < FM10K_RSSRK_SIZE * + FM10K_RSSRK_ENTRIES_PER_REG)) return -EINVAL; if (hf == 0) @@ -2202,8 +2202,8 @@ fm10k_rss_hash_conf_get(struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); - if (rss_conf->rss_key_len < FM10K_RSSRK_SIZE * - FM10K_RSSRK_ENTRIES_PER_REG) + if (key && (rss_conf->rss_key_len < FM10K_RSSRK_SIZE * + FM10K_RSSRK_ENTRIES_PER_REG)) return -EINVAL; if (key != NULL) |