Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / net / ethernet / qlogic / qed / qed_dev.c

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index 866cdc86a3f27c879d4364089597ea499a0b1714..fccdb06fc5c568f0f2db424f0d7ecb0d7847652f 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -3140,12 +3140,14 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
                        cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) |
                                        BIT(QED_MF_LLH_PROTO_CLSS) |
                                        BIT(QED_MF_UFP_SPECIFIC) |
-                                       BIT(QED_MF_8021Q_TAGGING);
+                                       BIT(QED_MF_8021Q_TAGGING) |
+                                       BIT(QED_MF_DONT_ADD_VLAN0_TAG);
                        break;
                case NVM_CFG1_GLOB_MF_MODE_BD:
                        cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) |
                                        BIT(QED_MF_LLH_PROTO_CLSS) |
-                                       BIT(QED_MF_8021AD_TAGGING);
+                                       BIT(QED_MF_8021AD_TAGGING) |
+                                       BIT(QED_MF_DONT_ADD_VLAN0_TAG);
                        break;
                case NVM_CFG1_GLOB_MF_MODE_NPAR1_0:
                        cdev->mf_bits = BIT(QED_MF_LLH_MAC_CLSS) |