diff options
author | Ursula Braun | 2010-03-08 21:36:56 +0100 |
---|---|---|
committer | David S. Miller | 2010-03-10 16:32:26 +0100 |
commit | 869da90b9ae39f0d5b9b5aa3a84502684a6aa1f4 (patch) | |
tree | 50519820fcb4c2cd7ab4a0d76074a46539680229 /drivers/s390/net/qeth_core_main.c | |
parent | qeth: set promisc off after trace disabling failure (diff) | |
download | kernel-qcow2-linux-869da90b9ae39f0d5b9b5aa3a84502684a6aa1f4.tar.gz kernel-qcow2-linux-869da90b9ae39f0d5b9b5aa3a84502684a6aa1f4.tar.xz kernel-qcow2-linux-869da90b9ae39f0d5b9b5aa3a84502684a6aa1f4.zip |
qeth: no recovery after layer mismatch (z/VM NICs)
Depending on their definition in z/VM, virtual devices for z/VM
VSWITCH or GuestLAN must be configured either in layer2 or in
layer3 mode. If qeth detects a layer mismatch, device activation
fails. Trying to recover from this error cannot help; thus
scheduling a recovery should be avoided.
In addition, since recovery is forbidden during online setting of
a qeth device, existence of its network device is guaranteed for all
dev_close() calls in qeth. The corresponding checks can be removed.
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_core_main.c')
-rw-r--r-- | drivers/s390/net/qeth_core_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index fa8a519218ac..834830a4866d 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -537,7 +537,8 @@ static void qeth_send_control_data_cb(struct qeth_channel *channel, dev_err(&card->gdev->dev, "The qeth device is not configured " "for the OSI layer required by z/VM\n"); - qeth_schedule_recovery(card); + else + qeth_schedule_recovery(card); goto out; } |