diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-26 21:16:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-26 21:16:46 +0200 |
| commit | 2bd93d7af1581d40e3c4b25242472661cb7c637a (patch) | |
| tree | 43c638422d20857339d8d908d6b65ebb8045edc0 /drivers/net/ehea/ehea_main.c | |
| parent | tg3: Update version to 3.118 (diff) | |
| parent | net: provide cow_metrics() methods to blackhole dst_ops (diff) | |
| download | linux-2bd93d7af1581d40e3c4b25242472661cb7c637a.tar.xz linux-2bd93d7af1581d40e3c4b25242472661cb7c637a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ehea/ehea_main.c')
| -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 ce2f0ca61d9a..a004bbcf72e6 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); } } |