bnxt_en: Move bnxt_approve_mac().
Move it before bnxt_update_vf_mac(). In the next patch, we need to call bnxt_approve_mac() from bnxt_update_mac() under some conditions. This will avoid forward declaration. Reviewed-by: Edwin Peer <edwin.peer@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6b70276898
commit
7b3c8e27d6
@ -1116,6 +1116,33 @@ void bnxt_hwrm_exec_fwd_req(struct bnxt *bp)
|
||||
}
|
||||
}
|
||||
|
||||
int bnxt_approve_mac(struct bnxt *bp, u8 *mac, bool strict)
|
||||
{
|
||||
struct hwrm_func_vf_cfg_input req = {0};
|
||||
int rc = 0;
|
||||
|
||||
if (!BNXT_VF(bp))
|
||||
return 0;
|
||||
|
||||
if (bp->hwrm_spec_code < 0x10202) {
|
||||
if (is_valid_ether_addr(bp->vf.mac_addr))
|
||||
rc = -EADDRNOTAVAIL;
|
||||
goto mac_done;
|
||||
}
|
||||
bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_VF_CFG, -1, -1);
|
||||
req.enables = cpu_to_le32(FUNC_VF_CFG_REQ_ENABLES_DFLT_MAC_ADDR);
|
||||
memcpy(req.dflt_mac_addr, mac, ETH_ALEN);
|
||||
rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
|
||||
mac_done:
|
||||
if (rc && strict) {
|
||||
rc = -EADDRNOTAVAIL;
|
||||
netdev_warn(bp->dev, "VF MAC address %pM not approved by the PF\n",
|
||||
mac);
|
||||
return rc;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void bnxt_update_vf_mac(struct bnxt *bp)
|
||||
{
|
||||
struct hwrm_func_qcaps_input req = {0};
|
||||
@ -1145,32 +1172,6 @@ update_vf_mac_exit:
|
||||
mutex_unlock(&bp->hwrm_cmd_lock);
|
||||
}
|
||||
|
||||
int bnxt_approve_mac(struct bnxt *bp, u8 *mac, bool strict)
|
||||
{
|
||||
struct hwrm_func_vf_cfg_input req = {0};
|
||||
int rc = 0;
|
||||
|
||||
if (!BNXT_VF(bp))
|
||||
return 0;
|
||||
|
||||
if (bp->hwrm_spec_code < 0x10202) {
|
||||
if (is_valid_ether_addr(bp->vf.mac_addr))
|
||||
rc = -EADDRNOTAVAIL;
|
||||
goto mac_done;
|
||||
}
|
||||
bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_VF_CFG, -1, -1);
|
||||
req.enables = cpu_to_le32(FUNC_VF_CFG_REQ_ENABLES_DFLT_MAC_ADDR);
|
||||
memcpy(req.dflt_mac_addr, mac, ETH_ALEN);
|
||||
rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
|
||||
mac_done:
|
||||
if (rc && strict) {
|
||||
rc = -EADDRNOTAVAIL;
|
||||
netdev_warn(bp->dev, "VF MAC address %pM not approved by the PF\n",
|
||||
mac);
|
||||
return rc;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
|
||||
int bnxt_cfg_hw_sriov(struct bnxt *bp, int *num_vfs, bool reset)
|
||||
|
Loading…
Reference in New Issue
Block a user