From: Michael Chan <michael.chan@broadcom.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [PATCH net-next v2 06/10] bnxt_en: Re-arrange bnxt_hwrm_func_qcaps().
Date: Tue, 20 Sep 2016 02:50:24 -0400 [thread overview]
Message-ID: <1474354228-3221-7-git-send-email-michael.chan@broadcom.com> (raw)
In-Reply-To: <1474354228-3221-1-git-send-email-michael.chan@broadcom.com>
Re-arrange the code so that the generation of the random MAC address for
the VF is at the end of the function. The next patch will add one more step
to call bnxt_approve_mac() to get the firmware to approve the random MAC
address.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 088b922..dc2559a 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -4161,6 +4161,11 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)
if (rc)
goto hwrm_func_qcaps_exit;
+ bp->tx_push_thresh = 0;
+ if (resp->flags &
+ cpu_to_le32(FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED))
+ bp->tx_push_thresh = BNXT_TX_PUSH_THRESH;
+
if (BNXT_PF(bp)) {
struct bnxt_pf_info *pf = &bp->pf;
@@ -4192,12 +4197,6 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)
struct bnxt_vf_info *vf = &bp->vf;
vf->fw_fid = le16_to_cpu(resp->fid);
- memcpy(vf->mac_addr, resp->mac_address, ETH_ALEN);
- if (is_valid_ether_addr(vf->mac_addr))
- /* overwrite netdev dev_adr with admin VF MAC */
- memcpy(bp->dev->dev_addr, vf->mac_addr, ETH_ALEN);
- else
- random_ether_addr(bp->dev->dev_addr);
vf->max_rsscos_ctxs = le16_to_cpu(resp->max_rsscos_ctx);
vf->max_cp_rings = le16_to_cpu(resp->max_cmpl_rings);
@@ -4209,14 +4208,16 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)
vf->max_l2_ctxs = le16_to_cpu(resp->max_l2_ctxs);
vf->max_vnics = le16_to_cpu(resp->max_vnics);
vf->max_stat_ctxs = le16_to_cpu(resp->max_stat_ctx);
+
+ memcpy(vf->mac_addr, resp->mac_address, ETH_ALEN);
+ if (is_valid_ether_addr(vf->mac_addr))
+ /* overwrite netdev dev_adr with admin VF MAC */
+ memcpy(bp->dev->dev_addr, vf->mac_addr, ETH_ALEN);
+ else
+ random_ether_addr(bp->dev->dev_addr);
#endif
}
- bp->tx_push_thresh = 0;
- if (resp->flags &
- cpu_to_le32(FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED))
- bp->tx_push_thresh = BNXT_TX_PUSH_THRESH;
-
hwrm_func_qcaps_exit:
mutex_unlock(&bp->hwrm_cmd_lock);
return rc;
--
1.8.3.1
next prev parent reply other threads:[~2016-09-20 6:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 6:50 [PATCH net-next v2 00/10] bnxt: update for net-next Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 01/10] bnxt_en: Use RSS flags defined in the bnxt_hsi.h file Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 02/10] bnxt_en: Simplify PCI device names and add additinal PCI IDs Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 03/10] bnxt_en: Update to firmware interface spec 1.5.1 Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 04/10] bnxt_en: Added support for Secure Firmware Update Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 05/10] bnxt_en: Fix ethtool -l|-L inconsistent channel counts Michael Chan
2016-09-20 14:52 ` Jakub Kicinski
2016-09-20 6:50 ` Michael Chan [this message]
2016-09-20 6:50 ` [PATCH net-next v2 07/10] bnxt_en: Call firmware to approve the random VF MAC address Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 08/10] bnxt_en: Pad TX packets below 52 bytes Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 09/10] bnxt_en: Support for "ethtool -r" command Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 10/10] bnxt_en: Fixed the VF link status after a link state change Michael Chan
2016-09-20 7:26 ` [PATCH net-next v2 00/10] bnxt: update for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474354228-3221-7-git-send-email-michael.chan@broadcom.com \
--to=michael.chan@broadcom.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).