From f3d242e8f2bf12cb45eb35b7d2e69483d1209b13 Mon Sep 17 00:00:00 2001 From: Frank Pavlic Date: Wed, 14 Sep 2005 18:05:31 +0200 Subject: [PATCH] s390: qeth driver fixes [patch 4/4] s390: qeth driver fixes . From: Frank Pavlic - Clear read channel first prior to using ccw_device_set_offline. - use QETH_DBF_TEXT instead of QETH_DBF_SPRINTF - invoke qeth_halt_channel and qeth_clear_channel for all channels, even if halt/clear for one of the channel fails. - enable qeth_arp_query function for GuestLAN devices Signed-off-by: Frank Pavlic diffstat: qeth.h | 2 - qeth_main.c | 106 +++++++++++++++++++++++++----------------------------------- qeth_sys.c | 11 +++--- 3 files changed, 53 insertions(+), 66 deletions(-) Signed-off-by: Jeff Garzik --- drivers/s390/net/qeth_sys.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'drivers/s390/net/qeth_sys.c') diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c index 4bdc9046d98..dda105b7306 100644 --- a/drivers/s390/net/qeth_sys.c +++ b/drivers/s390/net/qeth_sys.c @@ -1,6 +1,6 @@ /* * - * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.53 $) + * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.54 $) * * Linux on zSeries OSA Express and HiperSockets support * This file contains code related to sysfs. @@ -20,7 +20,7 @@ #include "qeth_mpc.h" #include "qeth_fs.h" -const char *VERSION_QETH_SYS_C = "$Revision: 1.53 $"; +const char *VERSION_QETH_SYS_C = "$Revision: 1.54 $"; /*****************************************************************************/ /* */ @@ -722,10 +722,13 @@ qeth_dev_layer2_store(struct device *dev, struct device_attribute *attr, const c if (!card) return -EINVAL; + if (card->info.type == QETH_CARD_TYPE_IQD) { + PRINT_WARN("Layer2 on Hipersockets is not supported! \n"); + return -EPERM; + } if (((card->state != CARD_STATE_DOWN) && - (card->state != CARD_STATE_RECOVER)) || - (card->info.type != QETH_CARD_TYPE_OSAE)) + (card->state != CARD_STATE_RECOVER))) return -EPERM; i = simple_strtoul(buf, &tmp, 16); -- cgit v1.2.3