summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorIvan Vecera <ivecera@redhat.com>2013-11-26 17:54:41 +0100
committerDavid S. Miller <davem@davemloft.net>2013-11-28 18:50:52 -0500
commit55485e7b417b640870b14eceec4cfbcb2b3e7a92 (patch)
tree99f714abe6e9da15030777b15ca4ff3bd61eb018 /drivers/net
parent39af0c409e8c06b51caf7dc43e49ef96ae790a55 (diff)
downloadtalos-obmc-linux-55485e7b417b640870b14eceec4cfbcb2b3e7a92.tar.gz
talos-obmc-linux-55485e7b417b640870b14eceec4cfbcb2b3e7a92.zip
be2net: call napi_disable() for all event queues
The recent be2net commit 6384a4d (adds a support for busy polling) introduces a regression that results in kernel crash. It incorrectly modified be_close() so napi_disable() is called only for the first queue. This breaks a correct pairing of napi_enable/_disable for the rest of event queues and causes a crash in subsequent be_open() call. Cc: Sathya Perla <sathya.perla@emulex.com> Cc: Subbu Seetharaman <subbu.seetharaman@emulex.com> Cc: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: Ivan Vecera <ivecera@redhat.com> Acked-by: Ajit Khaparde <ajit.khaparde@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 78a0e859760b..0aec4d23eb58 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2663,8 +2663,8 @@ static int be_close(struct net_device *netdev)
napi_disable(&eqo->napi);
be_disable_busy_poll(eqo);
}
- adapter->flags &= ~BE_FLAGS_NAPI_ENABLED;
}
+ adapter->flags &= ~BE_FLAGS_NAPI_ENABLED;
be_async_mcc_disable(adapter);
OpenPOWER on IntegriCloud