X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc.c;h=fd4156f786d245b6b307aa3fa29134febf5d5fa2;hb=de90612f4061a1bd538ad894f1ed18bcf11d335b;hp=26c7c322f39497f83d15ad10a3b8152a0f6a393f;hpb=048a0d1a81b64f003d08468c5b18ac3a0406e819;p=dpdk.git diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 26c7c322f3..fd4156f786 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -756,6 +756,12 @@ sfc_attach(struct sfc_adapter *sa) if (rc != 0) goto fail_estimate_rsrc_limits; + sa->evq_max_entries = encp->enc_evq_max_nevs; + SFC_ASSERT(rte_is_power_of_2(sa->evq_max_entries)); + + sa->evq_min_entries = encp->enc_evq_min_nevs; + SFC_ASSERT(rte_is_power_of_2(sa->evq_min_entries)); + sa->rxq_max_entries = encp->enc_rxq_max_ndescs; SFC_ASSERT(rte_is_power_of_2(sa->rxq_max_entries)); @@ -1109,12 +1115,12 @@ sfc_register_logtype(const struct rte_pci_addr *pci_addr, ++lt_prefix_str_size; /* Reserve space for prefix separator */ lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1; } else { - return RTE_LOGTYPE_PMD; + return sfc_logtype_driver; } lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0); if (lt_str == NULL) - return RTE_LOGTYPE_PMD; + return sfc_logtype_driver; strncpy(lt_str, lt_prefix_str, lt_prefix_str_size); lt_str[lt_prefix_str_size - 1] = '.'; @@ -1125,5 +1131,8 @@ sfc_register_logtype(const struct rte_pci_addr *pci_addr, ret = rte_log_register_type_and_pick_level(lt_str, ll_default); rte_free(lt_str); - return (ret < 0) ? RTE_LOGTYPE_PMD : ret; + if (ret < 0) + return sfc_logtype_driver; + + return ret; }