diff options
author | Sudarsana Reddy Kalluru <skalluru@marvell.com> | 2019-03-20 03:26:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-03-20 14:12:50 -0400 |
commit | 1a3ca25062cfff6cf6f60dbaa01edb01f9637f08 (patch) | |
tree | 075caa501251a9754f098c1cce93006f50c157d1 /drivers/net/ethernet/qlogic/qed/qed_dev.c | |
parent | a88381dece86a9c1043ddc0a4b07d5fa3689d298 (diff) |
qed: Define new MF bit for no_vlan config
The patch introduces a new Multi-Function bit for cases where firmware
shouldn't perform the insertion of vlan-0 tag. The new bit is defined to
abstract the implementation from the actual MF mode.
Signed-off-by: Sudarsana Reddy Kalluru <skalluru@marvell.com>
Signed-off-by: Ariel Elior <aelior@marvell.com>
Signed-off-by: Michal Kalderon <mkalderon@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qed/qed_dev.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index 9df8c4b3b54e..195573793352 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c | |||
@@ -3157,12 +3157,14 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) | |||
3157 | cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) | | 3157 | cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) | |
3158 | BIT(QED_MF_LLH_PROTO_CLSS) | | 3158 | BIT(QED_MF_LLH_PROTO_CLSS) | |
3159 | BIT(QED_MF_UFP_SPECIFIC) | | 3159 | BIT(QED_MF_UFP_SPECIFIC) | |
3160 | BIT(QED_MF_8021Q_TAGGING); | 3160 | BIT(QED_MF_8021Q_TAGGING) | |
3161 | BIT(QED_MF_DONT_ADD_VLAN0_TAG); | ||
3161 | break; | 3162 | break; |
3162 | case NVM_CFG1_GLOB_MF_MODE_BD: | 3163 | case NVM_CFG1_GLOB_MF_MODE_BD: |
3163 | cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) | | 3164 | cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) | |
3164 | BIT(QED_MF_LLH_PROTO_CLSS) | | 3165 | BIT(QED_MF_LLH_PROTO_CLSS) | |
3165 | BIT(QED_MF_8021AD_TAGGING); | 3166 | BIT(QED_MF_8021AD_TAGGING) | |
3167 | BIT(QED_MF_DONT_ADD_VLAN0_TAG); | ||
3166 | break; | 3168 | break; |
3167 | case NVM_CFG1_GLOB_MF_MODE_NPAR1_0: | 3169 | case NVM_CFG1_GLOB_MF_MODE_NPAR1_0: |
3168 | cdev->mf_bits = BIT(QED_MF_LLH_MAC_CLSS) | | 3170 | cdev->mf_bits = BIT(QED_MF_LLH_MAC_CLSS) | |