1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 46db549ce580..b57cc68058c0 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -1129,6 +1129,7 @@ static void falcon_handle_driver_event(struct efx_channel *channel,
         case RX_RECOVERY_EV_DECODE:
                 EFX_ERR(efx, "channel %d seen DRIVER RX_RESET event. "
                         "Resetting.\n", channel->channel);
+                atomic_inc(&efx->rx_reset);
                 efx_schedule_reset(efx,
                                    EFX_WORKAROUND_6555(efx) ?
                                    RESET_TYPE_RX_RECOVERY :
@@ -1731,7 +1732,8 @@ void falcon_drain_tx_fifo(struct efx_nic *efx)
         efx_oword_t temp;
         int count;
 
-        if (FALCON_REV(efx) < FALCON_REV_B0)
+        if ((FALCON_REV(efx) < FALCON_REV_B0) ||
+            (efx->loopback_mode != LOOPBACK_NONE))
                 return;
 
         falcon_read(efx, &temp, MAC0_CTRL_REG_KER);
@@ -2091,6 +2093,8 @@ static int falcon_probe_phy(struct efx_nic *efx)
                         efx->phy_type);
                 return -1;
         }
+
+        efx->loopback_modes = LOOPBACKS_10G_INTERNAL | efx->phy_op->loopbacks;
         return 0;
 }
 
@@ -2468,14 +2472,12 @@ int falcon_probe_nic(struct efx_nic *efx)
  fail5:
         falcon_free_buffer(efx, &efx->irq_status);
  fail4:
-        /* fall-thru */
  fail3:
         if (nic_data->pci_dev2) {
                 pci_dev_put(nic_data->pci_dev2);
                 nic_data->pci_dev2 = NULL;
         }
  fail2:
-        /* fall-thru */
  fail1:
         kfree(efx->nic_data);
         return rc;