bnx2x: use param's id instead of sp_obj's id

Previously, we've used the object's function id instead of using the
input's value. This is remedied, as in other flows.

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index b4afef60a25baab067bd7bfb0f3bbbcea552d8ce..bf14a08f079675e3a63dd8f4e40514be362a6515 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -2800,6 +2800,7 @@ static void bnx2x_pf_rx_q_prep(struct bnx2x *bp,
        rxq_init->sge_buf_sz = sge_sz;
        rxq_init->max_sges_pkt = max_sge;
        rxq_init->rss_engine_id = BP_FUNC(bp);
+       rxq_init->mcast_engine_id = BP_FUNC(bp);
 
        /* Maximum number or simultaneous TPA aggregation for this Queue.
         *

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index f913cdd17283fa55af2fb75a2a5d8fc2cd3e0a27..1999fa58704dba07d0b5891b7cf67e6a7a85c3ce 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -4473,7 +4473,7 @@ static void bnx2x_q_fill_init_rx_data(struct bnx2x_queue_sp_obj *o,
        rx_data->is_leading_rss = test_bit(BNX2X_Q_FLG_LEADING_RSS, flags);
 
        if (test_bit(BNX2X_Q_FLG_MCAST, flags)) {
-               rx_data->approx_mcast_engine_id = o->func_id;
+               rx_data->approx_mcast_engine_id = params->mcast_engine_id;
                rx_data->is_approx_mcast = 1;
        }
 

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index 0be63e70ea51ea58d6bfc27a49125d39d99d460b..4ce351b4d5179fd11eccbbf2ed6e6582acd8cf72 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
@@ -897,6 +897,9 @@ struct bnx2x_rxq_setup_params {
        u8              max_tpa_queues;
        u8              rss_engine_id;
 
+       /* valid iff BNX2X_Q_FLG_MCAST */
+       u8              mcast_engine_id;
+
        u8              cache_line_log;
 
        u8              sb_cq_index;