bnx2x: use BNX2X_Q_FLG_TPA_IPV6 for TPA queue configuration

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index b8f8793912c8160c39e00cb4ab00aebbd9eff9c0..7a891824fab2230c5303a3c3ecb4134d4194329d 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -2699,8 +2699,10 @@ static inline unsigned long bnx2x_get_q_flags(struct bnx2x *bp,
        if (IS_FCOE_FP(fp))
                __set_bit(BNX2X_Q_FLG_FCOE, &flags);
 
-       if (!fp->disable_tpa)
+       if (!fp->disable_tpa) {
                __set_bit(BNX2X_Q_FLG_TPA, &flags);
+               __set_bit(BNX2X_Q_FLG_TPA_IPV6, &flags);
+       }
 
        if (leading) {
                __set_bit(BNX2X_Q_FLG_LEADING_RSS, &flags);

diff --git a/drivers/net/bnx2x/bnx2x_sp.c b/drivers/net/bnx2x/bnx2x_sp.c
index 6306ff59de0c020573b8b19db836b89d73fbca55..5a213e476d85d7c6ebe6c3d471321842a9aee509 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_sp.c
+++ b/drivers/net/bnx2x/bnx2x_sp.c
@@ -4240,7 +4240,7 @@ static void bnx2x_q_fill_setup_data_e2(struct bnx2x *bp,
        /* Rx data */
 
        /* IPv6 TPA supported for E2 and above only */
-       data->rx.tpa_en |= test_bit(BNX2X_Q_FLG_TPA, &params->flags) *
+       data->rx.tpa_en |= test_bit(BNX2X_Q_FLG_TPA_IPV6, &params->flags) *
                                CLIENT_INIT_RX_DATA_TPA_EN_IPV6;
 }
 

diff --git a/drivers/net/bnx2x/bnx2x_sp.h b/drivers/net/bnx2x/bnx2x_sp.h
index 73400dd77b2fa45b04bc414c0a4fefaeae3207d0..9a517c2e9f1b66c6be01d286c21a6b978cfc684d 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_sp.h
+++ b/drivers/net/bnx2x/bnx2x_sp.h
@@ -749,6 +749,7 @@ enum bnx2x_queue_cmd {
 /* queue SETUP + INIT flags */
 enum {
        BNX2X_Q_FLG_TPA,
+       BNX2X_Q_FLG_TPA_IPV6,
        BNX2X_Q_FLG_STATS,
        BNX2X_Q_FLG_ZERO_STATS,
        BNX2X_Q_FLG_ACTIVE,