bnxt_en: Fix NTUPLE firmware command failures.

BugLink: https://bugs.launchpad.net/bugs/1862429
[ Upstream commit ceb3284c588eee5ea256c70e4d8d7cf399b8134e ]

The NTUPLE related firmware commands are sent to the wrong firmware
channel, causing all these commands to fail on new firmware that
supports the new firmware channel.  Fix it by excluding the 3
NTUPLE firmware commands from the list for the new firmware channel.

Fixes: 760b6d33410c ("bnxt_en: Add support for 2nd firmware message channel.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 16694b704d15500392d7572ebc1950f07e605c0d..57e2e1ccbc373ac9d4d2304adf0a95677feddc17 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1724,9 +1724,6 @@ static inline bool bnxt_cfa_hwrm_message(u16 req_type)
        case HWRM_CFA_ENCAP_RECORD_FREE:
        case HWRM_CFA_DECAP_FILTER_ALLOC:
        case HWRM_CFA_DECAP_FILTER_FREE:
-       case HWRM_CFA_NTUPLE_FILTER_ALLOC:
-       case HWRM_CFA_NTUPLE_FILTER_FREE:
-       case HWRM_CFA_NTUPLE_FILTER_CFG:
        case HWRM_CFA_EM_FLOW_ALLOC:
        case HWRM_CFA_EM_FLOW_FREE:
        case HWRM_CFA_EM_FLOW_CFG: