summaryrefslogtreecommitdiffstats
path: root/drivers/net/ehea/ehea.h
diff options
context:
space:
mode:
authorJan-Bernd Themann <ossthema@de.ibm.com>2010-06-15 07:35:42 +0200
committerDavid S. Miller <davem@davemloft.net>2010-06-17 03:05:27 +0200
commit099473c16bac7b936994bc95b5fd96f36397e1ad (patch)
tree09acc87af2002c2f737b83613394959120aee2c0 /drivers/net/ehea/ehea.h
parentehea: fix delayed packet processing (diff)
downloadlinux-099473c16bac7b936994bc95b5fd96f36397e1ad.tar.xz
linux-099473c16bac7b936994bc95b5fd96f36397e1ad.zip
ehea: Fix kernel deadlock in DLPAR-mem processing
Port reset operations and memory add/remove operations need to be serialized to avoid a kernel deadlock. The deadlock is caused by calling the napi_disable() function twice. Therefore we have to employ the dlpar_mem_lock in the ehea_reset_port function as well Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ehea/ehea.h')
-rw-r--r--drivers/net/ehea/ehea.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 0630980a2722..0060e422f171 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
#include <asm/io.h>
#define DRV_NAME "ehea"
-#define DRV_VERSION "EHEA_0103"
+#define DRV_VERSION "EHEA_0105"
/* eHEA capability flags */
#define DLPAR_PORT_ADD_REM 1