diff options
Diffstat (limited to 'drivers/net/sfc/falcon_xmac.c')
-rw-r--r-- | drivers/net/sfc/falcon_xmac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c index 7e57b4a54b37..69cb55fc615a 100644 --- a/drivers/net/sfc/falcon_xmac.c +++ b/drivers/net/sfc/falcon_xmac.c | |||
@@ -89,7 +89,7 @@ static void falcon_mask_status_intr(struct efx_nic *efx, bool enable) | |||
89 | return; | 89 | return; |
90 | 90 | ||
91 | /* We expect xgmii faults if the wireside link is up */ | 91 | /* We expect xgmii faults if the wireside link is up */ |
92 | if (!EFX_WORKAROUND_5147(efx) || !efx->link_up) | 92 | if (!EFX_WORKAROUND_5147(efx) || !efx->link_state.up) |
93 | return; | 93 | return; |
94 | 94 | ||
95 | /* We can only use this interrupt to signal the negative edge of | 95 | /* We can only use this interrupt to signal the negative edge of |
@@ -132,7 +132,7 @@ bool falcon_xaui_link_ok(struct efx_nic *efx) | |||
132 | efx_writeo(efx, ®, FR_AB_XX_CORE_STAT); | 132 | efx_writeo(efx, ®, FR_AB_XX_CORE_STAT); |
133 | 133 | ||
134 | /* If the link is up, then check the phy side of the xaui link */ | 134 | /* If the link is up, then check the phy side of the xaui link */ |
135 | if (efx->link_up && link_ok) | 135 | if (efx->link_state.up && link_ok) |
136 | if (efx->phy_op->mmds & (1 << MDIO_MMD_PHYXS)) | 136 | if (efx->phy_op->mmds & (1 << MDIO_MMD_PHYXS)) |
137 | link_ok = efx_mdio_phyxgxs_lane_sync(efx); | 137 | link_ok = efx_mdio_phyxgxs_lane_sync(efx); |
138 | 138 | ||
@@ -143,7 +143,7 @@ static void falcon_reconfigure_xmac_core(struct efx_nic *efx) | |||
143 | { | 143 | { |
144 | unsigned int max_frame_len; | 144 | unsigned int max_frame_len; |
145 | efx_oword_t reg; | 145 | efx_oword_t reg; |
146 | bool rx_fc = !!(efx->link_fc & EFX_FC_RX); | 146 | bool rx_fc = !!(efx->link_state.fc & EFX_FC_RX); |
147 | 147 | ||
148 | /* Configure MAC - cut-thru mode is hard wired on */ | 148 | /* Configure MAC - cut-thru mode is hard wired on */ |
149 | EFX_POPULATE_DWORD_3(reg, | 149 | EFX_POPULATE_DWORD_3(reg, |
@@ -356,7 +356,7 @@ static void falcon_xmac_irq(struct efx_nic *efx) | |||
356 | 356 | ||
357 | static void falcon_poll_xmac(struct efx_nic *efx) | 357 | static void falcon_poll_xmac(struct efx_nic *efx) |
358 | { | 358 | { |
359 | if (!EFX_WORKAROUND_5147(efx) || !efx->link_up || efx->mac_up) | 359 | if (!EFX_WORKAROUND_5147(efx) || !efx->link_state.up || efx->mac_up) |
360 | return; | 360 | return; |
361 | 361 | ||
362 | falcon_mask_status_intr(efx, false); | 362 | falcon_mask_status_intr(efx, false); |