net/dpaa: fix event queue detach

[dpdk.git] / drivers / net / sfc / sfc.c

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index ed714fe..51726d2 100644 (file)
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -371,7 +371,7 @@ sfc_set_drv_limits(struct sfc_adapter *sa)
 
        /*
         * Limits are strict since take into account initial estimation.
-        * Resource allocation stategy is described in
+        * Resource allocation strategy is described in
         * sfc_estimate_resource_limits().
         */
        lim.edl_min_evq_count = lim.edl_max_evq_count =
@@ -848,7 +848,9 @@ sfc_rss_attach(struct sfc_adapter *sa)
        efx_intr_fini(sa->nic);
 
        rte_memcpy(rss->key, default_rss_key, sizeof(rss->key));
-       rss->dummy_rss_context = EFX_RSS_CONTEXT_DEFAULT;
+       memset(&rss->dummy_ctx, 0, sizeof(rss->dummy_ctx));
+       rss->dummy_ctx.conf.qid_span = 1;
+       rss->dummy_ctx.dummy = true;
 
        return 0;
 
@@ -970,6 +972,10 @@ sfc_attach(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_rss_attach;
 
+       rc = sfc_flow_rss_attach(sa);
+       if (rc != 0)
+               goto fail_flow_rss_attach;
+
        rc = sfc_filter_attach(sa);
        if (rc != 0)
                goto fail_filter_attach;
@@ -1033,6 +1039,9 @@ fail_mae_counter_rxq_attach:
        sfc_filter_detach(sa);
 
 fail_filter_attach:
+       sfc_flow_rss_detach(sa);
+
+fail_flow_rss_attach:
        sfc_rss_detach(sa);
 
 fail_rss_attach:
@@ -1087,6 +1096,7 @@ sfc_detach(struct sfc_adapter *sa)
        sfc_mae_detach(sa);
        sfc_mae_counter_rxq_detach(sa);
        sfc_filter_detach(sa);
+       sfc_flow_rss_detach(sa);
        sfc_rss_detach(sa);
        sfc_port_detach(sa);
        sfc_ev_detach(sa);