summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnxt/bnxt.c
diff options
context:
space:
mode:
authorMichael Chan2016-12-29 18:13:34 +0100
committerDavid S. Miller2016-12-29 20:37:23 +0100
commit68515a186cf8a8f97956eaea5829277752399f58 (patch)
treee557d5f6b7375098adb8e85962d7035a38a36aae /drivers/net/ethernet/broadcom/bnxt/bnxt.c
parentbnxt_en: Improve the IRQ disable sequence during shutdown. (diff)
downloadkernel-qcow2-linux-68515a186cf8a8f97956eaea5829277752399f58.tar.gz
kernel-qcow2-linux-68515a186cf8a8f97956eaea5829277752399f58.tar.xz
kernel-qcow2-linux-68515a186cf8a8f97956eaea5829277752399f58.zip
bnxt_en: Fix and clarify link_info->advertising.
The advertising field is closely related to the auto_link_speeds field. The former is the user setting while the latter is the firmware setting. Both should be u16. We should use the advertising field in bnxt_get_link_ksettings because the auto_link_speeds field may not be updated with the latest from the firmware yet. Signed-off-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnxt/bnxt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 277573b3d261..4a8059fcc858 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -5363,7 +5363,7 @@ static void bnxt_hwrm_set_link_common(struct bnxt *bp,
{
u8 autoneg = bp->link_info.autoneg;
u16 fw_link_speed = bp->link_info.req_link_speed;
- u32 advertising = bp->link_info.advertising;
+ u16 advertising = bp->link_info.advertising;
if (autoneg & BNXT_AUTONEG_SPEED) {
req->auto_mode |=