diff options
| author |   Breno Leitao <leitao@linux.vnet.ibm.com> | 2011-04-19 09:39:22 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-04-20 01:41:26 -0700 |
| commit | 6f4d6dc167a001267eeff18bdea0ce3e9108c662 (patch) | |
| tree | e2730f18797c159df0f4953d4dca22cca48f58f9 /drivers/net/ehea | |
| parent | can: Add missing socket check in can/bcm release. (diff) | |
| download | linux-dev-6f4d6dc167a001267eeff18bdea0ce3e9108c662.tar.xz linux-dev-6f4d6dc167a001267eeff18bdea0ce3e9108c662.zip | |
ehea: Fix a DLPAR bug on ehea_rereg_mrs().
We are currently continuing if ehea_restart_qps() fails, when we
do a memory DLPAR (remove or add more memory to the system).
This patch just let the NAPI disabled if the ehea_restart_qps()
fails.
Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ehea')
| -rw-r--r-- | drivers/net/ehea/ehea_main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index f75d3144b8a5..53c0f04b1b23 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c @@ -3040,11 +3040,14 @@ static void ehea_rereg_mrs(void) if (dev->flags & IFF_UP) { mutex_lock(&port->port_lock); - port_napi_enable(port); ret = ehea_restart_qps(dev); - check_sqs(port); - if (!ret) + if (!ret) { + check_sqs(port); + port_napi_enable(port); netif_wake_queue(dev); + } else { + netdev_err(dev, "Unable to restart QPS\n"); + } mutex_unlock(&port->port_lock); } } |