]> git.karo-electronics.de Git - linux-beck.git/commitdiff
alx: fix fallback to msi or legacy interrupts
authorTobias Regnery <tobias.regnery@gmail.com>
Tue, 24 Jan 2017 13:34:23 +0000 (14:34 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Jan 2017 20:27:58 +0000 (15:27 -0500)
If requesting msi-x interrupts fails we should fall back to msi or
legacy interrupts. However alx_realloc_ressources don't call
alx_init_intr, so we fail to set the right number of tx queues.
This results in watchdog timeouts and a nonfunctional adapter.

Fixes: d768319cd427 ("alx: enable multiple tx queues")
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/atheros/alx/main.c

index 765306bd78c2c872ed4a905952a9acd7460df4e6..75cbd46e429d130b528a2f7aa10452b5a2c45b2e 100644 (file)
@@ -984,6 +984,7 @@ static int alx_realloc_resources(struct alx_priv *alx)
        alx_free_rings(alx);
        alx_free_napis(alx);
        alx_disable_advanced_intr(alx);
+       alx_init_intr(alx, false);
 
        err = alx_alloc_napis(alx);
        if (err)