bnxt_en: Fix VF attributes reporting.

Orabug: 26402533, 26325599, 26366387

The .ndo_get_vf_config() is returning the wrong qos attribute.  Fix
the code that checks and reports the qos and spoofchk attributes.  The
BNXT_VF_QOS and BNXT_VF_LINK_UP flags should not be set by default
during init. time.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit f0249056eaf2b9a17b2b76a6e099e9b7877e187d)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index 5bf93559d09700c52999e1ba9bc6b14f0270e6a5..3011e1da77f5475b4c5d358ec88ca8962563e025 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -138,8 +138,11 @@ int bnxt_get_vf_config(struct net_device *dev, int vf_id,
        ivi->max_tx_rate = vf->max_tx_rate;
        ivi->min_tx_rate = vf->min_tx_rate;
        ivi->vlan = vf->vlan;
-       ivi->qos = vf->flags & BNXT_VF_QOS;
-       ivi->spoofchk = vf->flags & BNXT_VF_SPOOFCHK;
+       if (vf->flags & BNXT_VF_QOS)
+               ivi->qos = vf->vlan >> VLAN_PRIO_SHIFT;
+       else
+               ivi->qos = 0;
+       ivi->spoofchk = !!(vf->flags & BNXT_VF_SPOOFCHK);
        if (!(vf->flags & BNXT_VF_LINK_FORCED))
                ivi->linkstate = IFLA_VF_LINK_STATE_AUTO;
        else if (vf->flags & BNXT_VF_LINK_UP)
@@ -300,7 +303,6 @@ static int bnxt_set_vf_attr(struct bnxt *bp, int num_vfs)
        for (i = 0; i < num_vfs; i++) {
                vf = &bp->pf.vf[i];
                memset(vf, 0, sizeof(*vf));
-               vf->flags = BNXT_VF_QOS | BNXT_VF_LINK_UP;
        }
        return 0;
 }