diff --git a/[refs] b/[refs] index c112c1652258..49a67f34c0a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 376801172ade1ab80efdd42dba859282400885ed +refs/heads/master: 3876732c12cd2b9896e8c3e86fad142112e93569 diff --git a/trunk/drivers/net/ehea/ehea.h b/trunk/drivers/net/ehea/ehea.h index 656cf1b8d32b..029631c58f0c 100644 --- a/trunk/drivers/net/ehea/ehea.h +++ b/trunk/drivers/net/ehea/ehea.h @@ -40,7 +40,7 @@ #include #define DRV_NAME "ehea" -#define DRV_VERSION "EHEA_0098" +#define DRV_VERSION "EHEA_0099" /* eHEA capability flags */ #define DLPAR_PORT_ADD_REM 1 diff --git a/trunk/drivers/net/ehea/ehea_main.c b/trunk/drivers/net/ehea/ehea_main.c index 958dacbb4974..40c34bfe2cfa 100644 --- a/trunk/drivers/net/ehea/ehea_main.c +++ b/trunk/drivers/net/ehea/ehea_main.c @@ -3517,12 +3517,14 @@ static int ehea_mem_notifier(struct notifier_block *nb, /* Readd canceled memory block */ case MEM_ONLINE: ehea_info("memory is going online"); + set_bit(__EHEA_STOP_XFER, &ehea_driver_flags); if (ehea_add_sect_bmap(arg->start_pfn, arg->nr_pages)) return NOTIFY_BAD; ehea_rereg_mrs(NULL); break; case MEM_GOING_OFFLINE: ehea_info("memory is going offline"); + set_bit(__EHEA_STOP_XFER, &ehea_driver_flags); if (ehea_rem_sect_bmap(arg->start_pfn, arg->nr_pages)) return NOTIFY_BAD; ehea_rereg_mrs(NULL);