Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / drivers / net / ethernet / sfc / selftest.c

diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
index 9d78830da6097ff1e6a42873f580734c7f970180..cd38b44ae23af330bca1c1b49d60a89b26438814 100644 (file)
--- a/drivers/net/ethernet/sfc/selftest.c
+++ b/drivers/net/ethernet/sfc/selftest.c
@@ -135,11 +135,19 @@ static int efx_test_interrupts(struct efx_nic *efx,
 {
        unsigned long timeout, wait;
        int cpu;
+       int rc;
 
        netif_dbg(efx, drv, efx->net_dev, "testing interrupts\n");
        tests->interrupt = -1;
 
-       efx_nic_irq_test_start(efx);
+       rc = efx_nic_irq_test_start(efx);
+       if (rc == -ENOTSUPP) {
+               netif_dbg(efx, drv, efx->net_dev,
+                         "direct interrupt testing not supported\n");
+               tests->interrupt = 0;
+               return 0;
+       }
+
        timeout = jiffies + IRQ_TIMEOUT;
        wait = 1;