aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-11-28 18:53:36 -0500
committerDavid S. Miller <davem@davemloft.net>2013-11-28 18:53:36 -0500
commit71237b6feb8361a00a1cb481a0c901fbee8f82a5 (patch)
tree4afeb5c9e1feb9972062017bd713d3e94b29f053 /drivers/net/ethernet
parentbe2net: call napi_disable() for all event queues (diff)
downloadlinux-dev-71237b6feb8361a00a1cb481a0c901fbee8f82a5.tar.xz
linux-dev-71237b6feb8361a00a1cb481a0c901fbee8f82a5.zip
Revert "be2net: call napi_disable() for all event queues"
This reverts commit 55485e7b417b640870b14eceec4cfbcb2b3e7a92. I applied the wrong version of this patch, the right one is coming up next. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-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 0aec4d23eb58..78a0e859760b 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);