aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Regnery <tobias.regnery@gmail.com>2017-01-24 08:34:23 -0500
committerDavid S. Miller <davem@davemloft.net>2017-01-24 15:27:58 -0500
commit37187a016c37d7e550544544dba25399ce4589c9 (patch)
tree561cd169a70c272f9f6ab340d95235e7f92ae871
parentf1db5c101cd48b5555ed9e061dcc49ed329812ea (diff)
alx: fix fallback to msi or legacy interrupts
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>
-rw-r--r--drivers/net/ethernet/atheros/alx/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 765306bd78c2..75cbd46e429d 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -984,6 +984,7 @@ static int alx_realloc_resources(struct alx_priv *alx)
984 alx_free_rings(alx); 984 alx_free_rings(alx);
985 alx_free_napis(alx); 985 alx_free_napis(alx);
986 alx_disable_advanced_intr(alx); 986 alx_disable_advanced_intr(alx);
987 alx_init_intr(alx, false);
987 988
988 err = alx_alloc_napis(alx); 989 err = alx_alloc_napis(alx);
989 if (err) 990 if (err)