diff options
| author | Greg Kroah-Hartman <[email protected]> | 2019-02-11 09:26:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2019-02-11 09:26:45 +0100 |
| commit | c744ca39f28f9a1e94a62ba02483619925d25ddc (patch) | |
| tree | bfcd445d31c88130cb0833675e2c7ea1c40f47e0 /drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | |
| parent | f233ea4327d7b6f67a224822fdc9241a9f4e4b59 (diff) | |
| parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
Merge 5.0-rc6 into tty-next
We need the tty fixes in here for other patches to be based on.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qed/qed_sp_commands.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c index 888274fa208b..5a495fda9e9d 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c +++ b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c @@ -604,6 +604,9 @@ int qed_sp_pf_update_stag(struct qed_hwfn *p_hwfn) p_ent->ramrod.pf_update.update_mf_vlan_flag = true; p_ent->ramrod.pf_update.mf_vlan = cpu_to_le16(p_hwfn->hw_info.ovlan); + if (test_bit(QED_MF_UFP_SPECIFIC, &p_hwfn->cdev->mf_bits)) + p_ent->ramrod.pf_update.mf_vlan |= + cpu_to_le16(((u16)p_hwfn->ufp_info.tc << 13)); return qed_spq_post(p_hwfn, p_ent, NULL); } |