Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/net/cxgb4/t4fw_api.h b/drivers/net/cxgb4/t4fw_api.h
index 0969f2fbc1b0..edcfd7ec7802 100644
--- a/drivers/net/cxgb4/t4fw_api.h
+++ b/drivers/net/cxgb4/t4fw_api.h
@@ -487,6 +487,11 @@ enum fw_params_param_pfvf {
         FW_PARAMS_PARAM_PFVF_CPMASK     = 0x25,
         FW_PARAMS_PARAM_PFVF_OCQ_START  = 0x26,
         FW_PARAMS_PARAM_PFVF_OCQ_END    = 0x27,
+        FW_PARAMS_PARAM_PFVF_CONM_MAP   = 0x28,
+        FW_PARAMS_PARAM_PFVF_IQFLINT_START = 0x29,
+        FW_PARAMS_PARAM_PFVF_IQFLINT_END = 0x2A,
+        FW_PARAMS_PARAM_PFVF_EQ_START   = 0x2B,
+        FW_PARAMS_PARAM_PFVF_EQ_END     = 0x2C,
 };
 
 /*
@@ -1234,6 +1239,7 @@ enum fw_port_type {
         FW_PORT_TYPE_KR,
         FW_PORT_TYPE_SFP,
         FW_PORT_TYPE_BP_AP,
+        FW_PORT_TYPE_BP4_AP,
 
         FW_PORT_TYPE_NONE = FW_PORT_CMD_PTYPE_MASK
 };